diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-12 21:52:18 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-12 21:52:18 +0400 |
| commit | 8996184ac4e96af4c7e2e46d3f836c962ccdb0b0 (patch) | |
| tree | d6571083a2ea6ec496bc1f85297ad32025ab0f46 /source/blender/collada/ArmatureImporter.cpp | |
| parent | 751bee184598859d99922d228e0de4a0df96de26 (diff) | |
Fixed importing of shapekey names: name is now taken from geometry name instead of deriving it from the mesh name
Diffstat (limited to 'source/blender/collada/ArmatureImporter.cpp')
| -rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index 6e8bf337abb..fefad7dd8ec 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -673,11 +673,14 @@ void ArmatureImporter::make_shape_keys() for (int i = 0 ; i < morphTargetIds.getCount() ; i++ ) { //better to have a seperate map of morph objects, //This'll do for now since only mesh morphing is imported + Mesh *me = this->mesh_importer->get_mesh_by_geom_uid(morphTargetIds[i]); if (me) { me->key = key; - kb = BKE_keyblock_add_ctime(key, me->id.name, FALSE); + std::string morph_name = *this->mesh_importer->get_geometry_name(me->id.name); + + kb = BKE_keyblock_add_ctime(key, morph_name.c_str(), FALSE); BKE_key_convert_from_mesh(me, kb); //apply weights |