diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-12 08:34:00 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-12 08:34:00 -0300 |
| commit | 35b404ba085819e5cd5f432b7c00ef3167523bb7 (patch) | |
| tree | 3219b591e13c31aef7b33cad46cd5febdc2d79e0 /tools | |
| parent | 5afaf84ae1406fd8d03887740c3d4a38fa5e2a29 (diff) | |
Unify naming of blendshape / morphtarget into just "Blend Shape"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/io_plugins/editor_import_collada.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/editor/io_plugins/editor_import_collada.cpp b/tools/editor/io_plugins/editor_import_collada.cpp index 5720e15caa..846a551121 100644 --- a/tools/editor/io_plugins/editor_import_collada.cpp +++ b/tools/editor/io_plugins/editor_import_collada.cpp @@ -624,12 +624,12 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con ERR_FAIL_COND_V( !collada.state.mesh_data_map.has(target), ERR_INVALID_DATA ); String name = collada.state.mesh_data_map[target].name; - p_mesh->add_morph_target(name); + p_mesh->add_blend_shape(name); } if (p_morph_data->mode=="RELATIVE") - p_mesh->set_morph_target_mode(Mesh::MORPH_MODE_RELATIVE); + p_mesh->set_blend_shape_mode(Mesh::BLEND_SHAPE_MODE_RELATIVE); else if (p_morph_data->mode=="NORMALIZED") - p_mesh->set_morph_target_mode(Mesh::MORPH_MODE_NORMALIZED); + p_mesh->set_blend_shape_mode(Mesh::BLEND_SHAPE_MODE_NORMALIZED); } |