diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-01-21 17:45:49 +0400 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-01-21 17:45:49 +0400 |
commit | c263753d1770b5b812ea0e5c38174fa296492e2f (patch) | |
tree | fecb2a493596b9078e36c43d723d527e172a9546 /source/blender/collada/DocumentExporter.cpp | |
parent | 7d286d9a8096438e7a197a2a3f365fbb9df6a0b1 (diff) |
Added gsoc-2012 collada improvements from bratwurst branch
Diffstat (limited to 'source/blender/collada/DocumentExporter.cpp')
-rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index c491326519f..71909b33db8 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -123,6 +123,7 @@ extern bool bc_has_object_type(LinkNode *export_set, short obtype); #include "ArmatureExporter.h" #include "AnimationExporter.h" #include "CameraExporter.h" +#include "ControllerExporter.h" #include "EffectExporter.h" #include "GeometryExporter.h" #include "ImageExporter.h" @@ -269,11 +270,15 @@ void DocumentExporter::exportCurrentScene(Scene *sce) // <library_controllers> ArmatureExporter arm_exporter(&sw, this->export_settings); - if (bc_has_object_type(export_set, OB_ARMATURE)) { - arm_exporter.export_controllers(sce); - } + 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); + //} // <library_visual_scenes> + SceneExporter se(&sw, &arm_exporter, this->export_settings); se.exportScene(sce); |