Merge branch 'master' of github.com:assimp/assimp into msvc-pch

.travis.yml

@@ -1,12 +1,17 @@
 before_install:
   - sudo apt-get install cmake
 
-before_script:
-  - cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES
+env:
+  - TRAVIS_NO_EXPORT=YES
+  - TRAVIS_NO_EXPORT=NO
 
 language: cpp
+
 compiler:
   - gcc
   - clang
-script: make
+
+script: cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT && make
+
+
 

include/assimp/material.inl

@@ -176,8 +176,6 @@ inline aiReturn aiMaterial::Get<aiString>(const char* pKey,unsigned int type,
 }
 
 
-#ifndef ASSIMP_BUILD_NO_EXPORT
-
 // ---------------------------------------------------------------------------
 template<class TYPE>
 aiReturn aiMaterial::AddProperty (const TYPE* pInput,
@@ -269,8 +267,6 @@ inline aiReturn aiMaterial::AddProperty<int> (const int* pInput,
 		pKey,type,index,aiPTI_Integer);
 }
 
-#endif
-
 //! @endcond
 
 #endif //! AI_MATERIAL_INL_INC