Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaia Clary <gaia.clary@machinimatrix.org>2013-07-18 11:54:19 +0400
committerGaia Clary <gaia.clary@machinimatrix.org>2013-07-18 11:54:19 +0400
commit1d4bd90c844ef2e9f48a97dbad1b8241e2abe29a (patch)
tree5de1d5dcd1ae01c90c55bffdad09a332fc2f55a1
parent66f6ace9383713ec27f4a684ec7561ce1a189d93 (diff)
Avoid creating Morph Controllers when shape key export is disabled
-rw-r--r--source/blender/collada/ControllerExporter.cpp2
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);
}
}