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>2019-05-23 23:27:45 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2019-05-23 23:37:26 +0300
commitb3f96da2e6052b75a8b1b06048dfb79e5bdfd76a (patch)
treecfa20e15570abf7fb3eb0ae92f9fdecc18ae6258 /source/blender/collada/TransformWriter.cpp
parentfd51d2f97cbe0117e8939396f196366a0043849e (diff)
fix unreported Collada exporter Regression: Added back minimal support for Maya bindpose
Diffstat (limited to 'source/blender/collada/TransformWriter.cpp')
-rw-r--r--source/blender/collada/TransformWriter.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp
index 0cbb8c65cf1..1fe0c1d4494 100644
--- a/source/blender/collada/TransformWriter.cpp
+++ b/source/blender/collada/TransformWriter.cpp
@@ -28,7 +28,9 @@
void TransformWriter::add_node_transform(COLLADASW::Node &node,
float mat[4][4],
float parent_mat[4][4],
- BCExportSettings &export_settings
+ BCExportSettings &export_settings,
+ bool has_restmat
+
)
{
// bool limit_precision = export_settings.limit_precision;
@@ -44,7 +46,7 @@ void TransformWriter::add_node_transform(COLLADASW::Node &node,
copy_m4_m4(local, mat);
}
- if (export_settings.get_apply_global_orientation()) {
+ if (!has_restmat && export_settings.get_apply_global_orientation()) {
bc_apply_global_transform(local, export_settings.get_global_transform());
}