Explorar o código

fix init of aiString

Kim Kulling %!s(int64=5) %!d(string=hai) anos
pai
achega
608e3102a0
Modificáronse 1 ficheiros con 3 adicións e 2 borrados
  1. 3 2
      code/Common/SkeletonMeshBuilder.cpp

+ 3 - 2
code/Common/SkeletonMeshBuilder.cpp

@@ -57,7 +57,7 @@ SkeletonMeshBuilder::SkeletonMeshBuilder(aiScene *pScene, aiNode *root, bool bKn
         return;
         return;
     }
     }
 
 
-    if (!root) {
+    if (nullptr != root) {
         root = pScene->mRootNode;
         root = pScene->mRootNode;
     }
     }
 
 
@@ -251,7 +251,8 @@ aiMaterial *SkeletonMeshBuilder::CreateMaterial() {
     aiMaterial *matHelper = new aiMaterial;
     aiMaterial *matHelper = new aiMaterial;
 
 
     // Name
     // Name
-    aiString matName(std::string("SkeletonMaterial"));
+    aiString matName;
+    matName.Set(std::string("SkeletonMaterial"));
     matHelper->AddProperty(&matName, AI_MATKEY_NAME);
     matHelper->AddProperty(&matName, AI_MATKEY_NAME);
     aiString matName("SkeletonMaterial");
     aiString matName("SkeletonMaterial");
     matHelper->AddProperty( &matName, AI_MATKEY_NAME);
     matHelper->AddProperty( &matName, AI_MATKEY_NAME);