Kaynağa Gözat

FIX: aiGetMaterialProperty is now exported properly

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@543 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
aramis_acg 15 yıl önce
ebeveyn
işleme
5355156b43
2 değiştirilmiş dosya ile 3 ekleme ve 3 silme
  1. 1 1
      include/aiMaterial.h
  2. 2 2
      include/aiMaterial.inl

+ 1 - 1
include/aiMaterial.h

@@ -1190,7 +1190,7 @@ extern "C" {
 ASSIMP_API C_ENUM aiReturn aiGetMaterialProperty(
 	 const C_STRUCT aiMaterial* pMat, 
     const char* pKey,
-	 C_ENUM aiTextureType type,
+	 unsigned int type,
     unsigned int  index,
     const C_STRUCT aiMaterialProperty** pPropOut);
 

+ 2 - 2
include/aiMaterial.inl

@@ -76,7 +76,7 @@ inline aiReturn aiMaterial::Get(const char* pKey,unsigned int type,
 	unsigned int iNum = pMax ? *pMax : 1;
 
 	const aiMaterialProperty* prop;
-	const aiReturn ret = ::aiGetMaterialProperty(this,pKey,(aiTextureType)type,idx,
+	const aiReturn ret = ::aiGetMaterialProperty(this,pKey,type,idx,
 		(const aiMaterialProperty**)&prop);
 	if ( AI_SUCCESS == ret )	{
 
@@ -102,7 +102,7 @@ inline aiReturn aiMaterial::Get(const char* pKey,unsigned int type,
 	unsigned int idx,Type& pOut) const
 {
 	const aiMaterialProperty* prop;
-	const aiReturn ret = ::aiGetMaterialProperty(this,pKey,(aiTextureType)type,idx,
+	const aiReturn ret = ::aiGetMaterialProperty(this,pKey,type,idx,
 		(const aiMaterialProperty**)&prop);
 	if ( AI_SUCCESS == ret )	{