aboutsummaryrefslogtreecommitdiff
path: root/editor/collada/collada.cpp
diff options
context:
space:
mode:
authorRémi Verschelde2018-05-01 08:35:10 +0200
committerGitHub2018-05-01 08:35:10 +0200
commit4cce6f34170d693be994d9a451b4b5f96a084cfb (patch)
tree74fa8c76ccd7eb2f289f08bb38a095c4cc74cb59 /editor/collada/collada.cpp
parent613a8bee415381a8564d34092b479e1f159e8e60 (diff)
parente6deba8d196a206ff350bc4d9fff783f78395d33 (diff)
downloadgodot-4cce6f34170d693be994d9a451b4b5f96a084cfb.tar.gz
godot-4cce6f34170d693be994d9a451b4b5f96a084cfb.tar.zst
godot-4cce6f34170d693be994d9a451b4b5f96a084cfb.zip
Merge pull request #18321 from Crazy-P/Fixes-logically-dead-code
Fixes logically dead code (Coverity)
Diffstat (limited to 'editor/collada/collada.cpp')
-rw-r--r--editor/collada/collada.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/editor/collada/collada.cpp b/editor/collada/collada.cpp
index 4ce57d7f6..734229d01 100644
--- a/editor/collada/collada.cpp
+++ b/editor/collada/collada.cpp
@@ -2266,10 +2266,8 @@ void Collada::_merge_skeletons2(VisualScene *p_vscene) {
}
node = node->parent;
}
- ERR_CONTINUE(!sk);
- if (!sk)
- continue; //bleh
+ ERR_CONTINUE(!sk);
if (!skeleton) {
skeleton = sk;