diff options
Diffstat (limited to 'source/blender/collada/TransformWriter.cpp')
| -rw-r--r-- | source/blender/collada/TransformWriter.cpp | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp index bfeec813436..0a66db72cb9 100644 --- a/source/blender/collada/TransformWriter.cpp +++ b/source/blender/collada/TransformWriter.cpp @@ -25,23 +25,6 @@ #include "TransformWriter.h" -static BC_export_transformation_type get_transformation_type(BCExportSettings &export_settings) -{ - bool enforce_matrix_export = export_settings.get_include_animations(); - - return (enforce_matrix_export) ? BC_TRANSFORMATION_TYPE_MATRIX : - export_settings.get_object_transformation_type(); -} - -static BC_export_transformation_type get_transformation_type(Object *ob, - BCExportSettings &export_settings) -{ - bool enforce_matrix_export = ob->type == OB_ARMATURE && export_settings.get_include_animations(); - - return (enforce_matrix_export) ? BC_TRANSFORMATION_TYPE_MATRIX : - export_settings.get_object_transformation_type(); -} - void TransformWriter::add_joint_transform(COLLADASW::Node &node, float mat[4][4], float parent_mat[4][4], @@ -68,7 +51,7 @@ void TransformWriter::add_joint_transform(COLLADASW::Node &node, converter->mat4_to_dae_double(dmat, local); delete converter; - if (get_transformation_type(export_settings) == BC_TRANSFORMATION_TYPE_MATRIX) { + if (export_settings.get_object_transformation_type() == BC_TRANSFORMATION_TYPE_MATRIX) { node.addMatrix("transform", dmat); } else { @@ -96,7 +79,7 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node &node, bc_add_global_transform(f_obmat, export_settings.get_global_transform()); } - switch (get_transformation_type(ob, export_settings)) { + switch (export_settings.get_object_transformation_type()) { case BC_TRANSFORMATION_TYPE_MATRIX: { UnitConverter converter; double d_obmat[4][4]; |