Merge branch 'master' into wangyi_basisu

pull/3893/head
Kim Kulling 2021-05-25 17:17:07 +02:00 committed by GitHub
commit 6b8a00dfa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -1263,7 +1263,7 @@ aiMeshMorphAnim *CreateMeshMorphAnim(glTF2::Asset&, Node &node, AnimationSampler
static const float kMillisecondsFromSeconds = 1000.f; static const float kMillisecondsFromSeconds = 1000.f;
if (nullptr != samplers.weight) { if (samplers.weight && samplers.weight->input && samplers.weight->output) {
float *times = nullptr; float *times = nullptr;
samplers.weight->input->ExtractData(times); samplers.weight->input->ExtractData(times);
float *values = nullptr; float *values = nullptr;