diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-08-08 08:14:51 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-08-08 08:14:51 -0300 |
| commit | de219e5cbe1e9f31eae038cbf23dd95cfd30e7e0 (patch) | |
| tree | c8b05cdf10894ad73e74293fcc6238e396c03e77 /editor/collada | |
| parent | 5e1116da4ce052acc64f45ba4bd71310b4826aea (diff) | |
fix collada crash on invalid (blender internal expored...) file, fixes #6222
Diffstat (limited to 'editor/collada')
| -rw-r--r-- | editor/collada/collada.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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)); } |