archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

merge from master

Browse Source
This commit is contained in:
Gaia Clary
2018-02-26 22:49:30 +01:00
parent e94276d403 7dd0e36dc4
commit f228a08d02
29 changed files with 522 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/collada/SceneExporter.cpp
View File

@@ -39,11 +39,6 @@ SceneExporter::SceneExporter(COLLADASW::StreamWriter *sw, ArmatureExporter *arm,
{
}
void SceneExporter::setExportTransformationType(BC_export_transformation_type transformation_type)
{
this->transformation_type = transformation_type;
}
void SceneExporter::exportScene(const EvaluationContext *eval_ctx, Scene *sce)
{
// <library_visual_scenes> <visual_scene>
@@ -139,7 +134,7 @@ void SceneExporter::writeNodes(const EvaluationContext *eval_ctx, Object *ob, Sc
// for skinned mesh we write obmat in <bind_shape_matrix>
TransformWriter::add_node_transform_identity(colladaNode);
else {
TransformWriter::add_node_transform_ob(colladaNode, ob, this->transformation_type);
TransformWriter::add_node_transform_ob(colladaNode, ob, this->export_settings->export_transformation_type);
}
// <instance_geometry>