Merge branch 'master' into wangyi_basisu

2021-05-25 17:17:07 +02:00
parent b5e54e4d3b 743b87883e
commit 6b8a00dfa1
1 changed files with 1 additions and 1 deletions
--- a/code/AssetLib/glTF2/glTF2Importer.cpp
+++ b/code/AssetLib/glTF2/glTF2Importer.cpp
@@ -1263,7 +1263,7 @@ aiMeshMorphAnim *CreateMeshMorphAnim(glTF2::Asset&, Node &node, AnimationSampler

        static const float kMillisecondsFromSeconds = 1000.f;

-        if (nullptr != samplers.weight) {
+        if (samplers.weight && samplers.weight->input && samplers.weight->output) {
            float *times = nullptr;
            samplers.weight->input->ExtractData(times);
            float *values = nullptr;