summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-04-23 22:42:52 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-04-23 22:42:52 -0300
commitb09a8bd32fa2aca8162a0fa2d4a113c7189d5971 (patch)
tree8dd1670b87b9f6e91319304e9c2adae21b74b404
parent5e03874571d72b41d27803a4338f98bc150c2600 (diff)
fix to collada import crash
-rw-r--r--tools/editor/io_plugins/editor_import_collada.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/editor/io_plugins/editor_import_collada.cpp b/tools/editor/io_plugins/editor_import_collada.cpp
index d7e883ef62..adc5b2827f 100644
--- a/tools/editor/io_plugins/editor_import_collada.cpp
+++ b/tools/editor/io_plugins/editor_import_collada.cpp
@@ -1616,6 +1616,7 @@ Error ColladaImport::_create_resources(Collada::Node *p_node) {
if (collada.state.morph_controller_data_map.has(meshid)) {
//it's a morph!!
+ morph = &collada.state.morph_controller_data_map[meshid];
ngsource=meshid;
meshid=morph->mesh;
} else {