Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-31 22:21:52 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Juan Linietsky 2015-04-24 15:09:47 -03:00
commit 4fb905ed29
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
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)) { if (collada.state.morph_controller_data_map.has(meshid)) {
//it's a morph!! //it's a morph!!
morph = &collada.state.morph_controller_data_map[meshid];
ngsource=meshid; ngsource=meshid;
meshid=morph->mesh; meshid=morph->mesh;
} else { } else {