From 6551fd4903628bef69f5d7bbd0f0f5b262f32d2e Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Wed, 17 Apr 2013 18:47:52 -0700 Subject: [PATCH] Update material.inl aiMaterial::AddProperty template specializations are used by import methods in B3DImporter and SceneProcessor; they should be defined accordingly even when ASSIMP_BUILD_NO_EXPORT is defined. --- include/assimp/material.inl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/assimp/material.inl b/include/assimp/material.inl index e2f3edb65..5e9051f4e 100644 --- a/include/assimp/material.inl +++ b/include/assimp/material.inl @@ -176,8 +176,6 @@ inline aiReturn aiMaterial::Get(const char* pKey,unsigned int type, } -#ifndef ASSIMP_BUILD_NO_EXPORT - // --------------------------------------------------------------------------- template aiReturn aiMaterial::AddProperty (const TYPE* pInput, @@ -269,8 +267,6 @@ inline aiReturn aiMaterial::AddProperty (const int* pInput, pKey,type,index,aiPTI_Integer); } -#endif - //! @endcond #endif //! AI_MATERIAL_INL_INC