diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2019-05-23 23:27:45 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2019-05-23 23:37:26 +0300 |
| commit | b3f96da2e6052b75a8b1b06048dfb79e5bdfd76a (patch) | |
| tree | cfa20e15570abf7fb3eb0ae92f9fdecc18ae6258 /source/blender/collada/ControllerExporter.cpp | |
| parent | fd51d2f97cbe0117e8939396f196366a0043849e (diff) | |
fix unreported Collada exporter Regression: Added back minimal support for Maya bindpose
Diffstat (limited to 'source/blender/collada/ControllerExporter.cpp')
| -rw-r--r-- | source/blender/collada/ControllerExporter.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index adea9fd672a..cb15a3a7a7c 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -553,8 +553,10 @@ std::string ControllerExporter::add_inv_bind_mats_source(Object *ob_arm, /* make world-space matrix (bind_mat is armature-space) */ mul_m4_m4m4(world, ob_arm->obmat, bind_mat); - if (export_settings.get_apply_global_orientation()) { - bc_apply_global_transform(world, export_settings.get_global_transform()); + if (!has_bindmat) { + if (export_settings.get_apply_global_orientation()) { + bc_apply_global_transform(world, export_settings.get_global_transform()); + } } invert_m4_m4(mat, world); |