diff options
| author | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2012-08-10 19:25:50 +0400 |
|---|---|---|
| committer | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2012-08-10 19:25:50 +0400 |
| commit | 85400cf7cbe1aa6cb0a13b7689559eaffaba0999 (patch) | |
| tree | 092ee27e88abb629b852304ec419c7e256d3214d /source/blender/collada | |
| parent | 539c3d296de87b0b31705fe19b7dc1a761f09399 (diff) | |
Morph target export to COLLADA fix
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 6 | ||||
| -rw-r--r-- | source/blender/collada/GeometryExporter.cpp | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index c47798ee804..f2bf8f14572 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -266,9 +266,11 @@ void DocumentExporter::exportCurrentScene(Scene *sce) // <library_controllers> ArmatureExporter arm_exporter(&sw, this->export_settings); - if (bc_has_object_type(export_set, OB_ARMATURE)) { + //for Morph controller export, removing the check + /*if (bc_has_object_type(export_set, OB_ARMATURE)) + {*/ arm_exporter.export_controllers(sce); - } + //} // <library_visual_scenes> SceneExporter se(&sw, &arm_exporter, this->export_settings); diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index 73dc36d9905..4f3fe6d13ba 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -158,9 +158,10 @@ void GeometryExporter::operator()(Object *ob) //shape keys Key * key = ob_get_key(ob); if(key){ - KeyBlock * kb; - for (kb = (KeyBlock*)key->block.first; kb; kb = kb->next) { - //have to skip the basis mesh + KeyBlock * kb = (KeyBlock*)key->block.first; + //skip the basis + kb = kb->next; + for (; kb; kb = kb->next) { key_to_mesh(kb, me); export_key_mesh(ob, me, kb); } @@ -215,7 +216,7 @@ void GeometryExporter::export_key_mesh(Object *ob, Mesh *me, KeyBlock *kb){ input_list.push_back(input); verts.add(); - createLooseEdgeList(ob, me, geom_id, norind); + //createLooseEdgeList(ob, me, geom_id, norind); // XXX slow if (ob->totcol) { |