Home Explore Help
Sign In
Godot
/
godot
mirror of https://github.com/godotengine/godot.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge branch 'master' of https://github.com/okamstudio/godot

Juan Linietsky 10 years ago
parent
115f55e972 b09a8bd32f
commit
4fb905ed29
1 changed files with 1 additions and 0 deletions
Split View Show Diff Stats
  1. 1 0
      tools/editor/io_plugins/editor_import_collada.cpp

+ 1 - 0
tools/editor/io_plugins/editor_import_collada.cpp
View File 

@@ -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 {