diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-03-04 04:28:25 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-03-04 04:28:25 +0400 |
| commit | 78351264195aeb2823470647526feaf404d16848 (patch) | |
| tree | a3071d72cda013de3b5a899660de919c669d0fc6 /source/blender/collada | |
| parent | f19206a361dbb75b737c253270196c34c3808799 (diff) | |
Collada: Fix: do not export controllers when shape_key exporting is disabled
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index 71909b33db8..09aec2a43a7 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -271,11 +271,10 @@ void DocumentExporter::exportCurrentScene(Scene *sce) // <library_controllers> ArmatureExporter arm_exporter(&sw, this->export_settings); ControllerExporter controller_exporter(&sw , this->export_settings); - //for Morph controller export, removing the check - /*if (bc_has_object_type(export_set, OB_ARMATURE)) - {*/ - controller_exporter.export_controllers(sce); - //} + if (bc_has_object_type(export_set, OB_ARMATURE) || this->export_settings->include_shapekeys) + { + controller_exporter.export_controllers(sce); + } // <library_visual_scenes> |