diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-07-18 14:18:51 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-07-18 14:18:51 +0400 |
| commit | 4a999f9e96965bd4aa45ce4cdd5c225bbf901226 (patch) | |
| tree | 0d53aaf826a8517e53d89f9b69ddd29e96549a88 /source/blender/collada/ControllerExporter.cpp | |
| parent | 352c1e500da111989d2d7847fd6a6b9a130c5de4 (diff) | |
| parent | 530bcc422e97afa18ac998aa5ecd11e8e9560c55 (diff) | |
Merging r58341 through r58364 from trunk into blender-2.68-releasev2.68
Diffstat (limited to 'source/blender/collada/ControllerExporter.cpp')
| -rw-r--r-- | source/blender/collada/ControllerExporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index 4c6f71ff1a6..d04ed8d6fa1 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -123,7 +123,7 @@ void ControllerExporter::operator()(Object *ob) if (ob_arm) { export_skin_controller(ob, ob_arm); } - if (key) { + if (key && this->export_settings->include_shapekeys) { export_morph_controller(ob, key); } } |