From c99bd9825ade9a3285fcf97dc8e9433411b46589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Terziman?= Date: Wed, 29 Apr 2015 18:13:16 +0200 Subject: [PATCH] Fixed bug introduced by misleading names in materials properties between "type" parameters of function referring to the "semantic" field of properties (and NOT the type field...) --- code/SceneCombiner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/SceneCombiner.cpp b/code/SceneCombiner.cpp index eaca35cd6..b46354214 100644 --- a/code/SceneCombiner.cpp +++ b/code/SceneCombiner.cpp @@ -920,7 +920,7 @@ void SceneCombiner::MergeMaterials(aiMaterial** dest, // Test if we already have a matching property const aiMaterialProperty* prop_exist; - if(aiGetMaterialProperty(out, sprop->mKey.C_Str(), sprop->mType, sprop->mIndex, &prop_exist) != AI_SUCCESS) { + if(aiGetMaterialProperty(out, sprop->mKey.C_Str(), sprop->mSemantic, sprop->mIndex, &prop_exist) != AI_SUCCESS) { // If not, we add it to the new material aiMaterialProperty* prop = out->mProperties[out->mNumProperties] = new aiMaterialProperty();