Merge branch 'master' into gltf1_gltf2_split

2020-07-06 09:11:06 +01:00
parent abf43eaf74 a211aff522
commit fb11705dd0
2 changed files with 3 additions and 2 deletions
--- a/code/PostProcessing/ArmaturePopulate.cpp
+++ b/code/PostProcessing/ArmaturePopulate.cpp
@@ -168,7 +168,6 @@ void ArmaturePopulate::BuildBoneStack(aiNode *,
                                      const std::vector<aiBone *> &bones,
                                      std::map<aiBone *, aiNode *> &bone_stack,
                                  std::vector<aiNode *> &node_stack) {
-    ai_assert(scene);
    ai_assert(root_node);
    ai_assert(!node_stack.empty());