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>2012-05-27 02:46:28 +0400
committerGaia Clary <gaia.clary@machinimatrix.org>2012-05-27 02:46:28 +0400
commit822362189badefd6c0014f608d36d98e8ab57282 (patch)
tree3f1a8a574aa311b11bbefe5f4191149e659a9f7f /source/blender/collada/ArmatureExporter.cpp
parent54b64cfd612922054f014460f1c08ec4b0374a3d (diff)
[#31607] Collada: (Exporter) Implementation of 'use Object Instantiation' Option
Diffstat (limited to 'source/blender/collada/ArmatureExporter.cpp')
-rw-r--r--source/blender/collada/ArmatureExporter.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/collada/ArmatureExporter.cpp
index 38a5e9b5df4..9d59be39f33 100644
--- a/source/blender/collada/ArmatureExporter.cpp
+++ b/source/blender/collada/ArmatureExporter.cpp
@@ -324,6 +324,7 @@ void ArmatureExporter::export_controller(Object* ob, Object *ob_arm)
} MDeformWeight;
*/
+ bool use_instantiation = this->export_settings->use_object_instantiation;
Mesh *me = (Mesh*)ob->data;
if (!me->dvert) return;
@@ -331,7 +332,7 @@ void ArmatureExporter::export_controller(Object* ob, Object *ob_arm)
std::string controller_id = get_controller_id(ob_arm, ob);
openSkin(controller_id, controller_name,
- COLLADABU::URI(COLLADABU::Utils::EMPTY_STRING, get_geometry_id(ob)));
+ COLLADABU::URI(COLLADABU::Utils::EMPTY_STRING, get_geometry_id(ob, use_instantiation)));
add_bind_shape_mat(ob);