diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-23 10:00:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 10:00:31 +0200 |
| commit | 393a0152eaccaf21313b6186adeea1cf6a7f0623 (patch) | |
| tree | 28044bd643418b4293494391b3c1d32163126dd8 /modules/assimp/editor_scene_importer_assimp.cpp | |
| parent | 791da4cb83bda1b3ef8dc167e3db7cccf10e8762 (diff) | |
| parent | 50be65bf4314d9b3c5888f5f02d6ffae504aae7a (diff) | |
Merge pull request #32055 from qarmin/some_code_fixes
Changed some code found by Clang Tidy and Coverity
Diffstat (limited to 'modules/assimp/editor_scene_importer_assimp.cpp')
| -rw-r--r-- | modules/assimp/editor_scene_importer_assimp.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/modules/assimp/editor_scene_importer_assimp.cpp b/modules/assimp/editor_scene_importer_assimp.cpp index 6a95d355eb..f2f51d9dd3 100644 --- a/modules/assimp/editor_scene_importer_assimp.cpp +++ b/modules/assimp/editor_scene_importer_assimp.cpp @@ -1280,7 +1280,6 @@ void EditorSceneImporterAssimp::create_bone(ImportState &state, RecursiveState & // this transform is a bone recursive_state.skeleton->add_bone(recursive_state.node_name); - ERR_FAIL_COND(recursive_state.skeleton == NULL); // serious bug we must now exit. //ERR_FAIL_COND(recursive_state.skeleton->get_name() == ""); print_verbose("Bone added to lookup: " + AssimpUtils::get_assimp_string(recursive_state.bone->mName)); print_verbose("Skeleton attached to: " + recursive_state.skeleton->get_name()); |