diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-04-24 15:09:47 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-24 15:09:47 -0300 |
| commit | 4fb905ed29357a57933f796b1478a4f874b83c05 (patch) | |
| tree | f802b383608d74a5ed22c940f330dd15412e73ce | |
| parent | 115f55e972b23936953a4a3958e69297fa04050e (diff) | |
| parent | b09a8bd32fa2aca8162a0fa2d4a113c7189d5971 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
| -rw-r--r-- | tools/editor/io_plugins/editor_import_collada.cpp | 1 |
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 8caaed5d80..d510333a32 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 { |