From de219e5cbe1e9f31eae038cbf23dd95cfd30e7e0 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Tue, 8 Aug 2017 08:14:51 -0300
Subject: fix collada crash on invalid (blender internal expored...) file,
 fixes #6222

---
 editor/collada/collada.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'editor/collada')

diff --git a/editor/collada/collada.cpp b/editor/collada/collada.cpp
index ab1e397ccc..169c34782d 100644
--- a/editor/collada/collada.cpp
+++ b/editor/collada/collada.cpp
@@ -2220,6 +2220,7 @@ void Collada::_merge_skeletons(VisualScene *p_vscene, Node *p_node) {
 				ERR_CONTINUE(!state.scene_map.has(nodeid)); //weird, it should have it...
 
 				NodeJoint *nj = SAFE_CAST<NodeJoint *>(state.scene_map[nodeid]);
+				ERR_CONTINUE(!nj); //broken collada
 				if (!nj->owner) {
 					print_line("no owner for: " + String(nodeid));
 				}
-- 
cgit v1.2.3