瀏覽代碼

fix collada crash on invalid (blender internal expored...) file, fixes #6222

(cherry picked from commit de219e5cbe1e9f31eae038cbf23dd95cfd30e7e0)
Juan Linietsky 8 年之前
父節點
當前提交
b94c5a31cd
共有 1 個文件被更改,包括 1 次插入0 次删除
  1. 1 0
      editor/collada/collada.cpp

+ 1 - 0
editor/collada/collada.cpp

@@ -2207,6 +2207,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));
 				}