Merge branch 'master' into assimp_resource

2022-05-04 02:12:08 +04:00
parent 94ebe71969 abfb26ab6f
commit f86700f6f4
8 changed files with 17 additions and 20 deletions
--- a/tools/assimp_cmd/Info.cpp
+++ b/tools/assimp_cmd/Info.cpp
@@ -441,7 +441,7 @@ int Assimp_Info(const char *const *params, unsigned int num) {
                    prop->mKey.data,
                    prop->mIndex,
                    prop->mDataLength,
-                    TextureTypeToString(textype));
+                    aiTextureTypeToString(textype));
        }
    }
    if (scene->mNumMaterials) {