瀏覽代碼

Fix strict aliasing violation in MaterialSystem

Turo Lamminen 7 年之前
父節點
當前提交
bbb60c29f0
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      code/MaterialSystem.cpp

+ 3 - 2
code/MaterialSystem.cpp

@@ -354,8 +354,9 @@ aiReturn aiGetMaterialTexture(const C_STRUCT aiMaterial* mat,
         return AI_FAILURE;
         return AI_FAILURE;
     }
     }
     // Determine mapping type
     // Determine mapping type
-    aiTextureMapping mapping = aiTextureMapping_UV;
-    aiGetMaterialInteger(mat,AI_MATKEY_MAPPING(type,index),(int*)&mapping);
+    int mapping_ = static_cast<int>(aiTextureMapping_UV);
+    aiGetMaterialInteger(mat,AI_MATKEY_MAPPING(type,index), &mapping_);
+    aiTextureMapping mapping = static_cast<aiTextureMapping>(mapping_);
     if (_mapping)
     if (_mapping)
         *_mapping = mapping;
         *_mapping = mapping;