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/GeometryExporter.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/GeometryExporter.cpp')
| -rw-r--r-- | source/blender/collada/GeometryExporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index 19d67f37476..4a6c5b43ce2 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -187,7 +187,7 @@ void GeometryExporter::export_key_mesh(Object *ob, Mesh *me, KeyBlock *kb) return; } - std::string geom_name = id_name(ob) + "_morph_" + kb->name; + std::string geom_name = kb->name; exportedGeometry.insert(geom_id); |