Merge pull request #31 from jdduke/patch-1

Enable aiMaterial::AddProperty template specializations in ASSIMP_NO_EXPORT builds
2013-04-18 01:15:48 -07:00 · 2013-04-18 01:15:48 -07:00 · 17e888e762
parent 863645e88b 6551fd4903
commit 17e888e762
1 changed files with 0 additions and 4 deletions
--- a/include/assimp/material.inl
+++ b/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