diff --git a/include/aiMaterial.h b/include/aiMaterial.h index da82680d0..8488acf8c 100644 --- a/include/aiMaterial.h +++ b/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); diff --git a/include/aiMaterial.inl b/include/aiMaterial.inl index 520e88377..b36057cf8 100644 --- a/include/aiMaterial.inl +++ b/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 ) {