diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2019-05-27 16:34:05 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2019-05-27 17:00:32 +0300 |
commit | bc055258d5abdd692003e5ae175d2548183818a4 (patch) | |
tree | 8e06a1340c430745c8ee7b11f5c55a580faa712e /source/blender/collada/ExportSettings.h | |
parent | 4db3916b60da565f11cb73d905458d66d0347c8a (diff) |
fix: collada transformtype must be identical for animation export and object export
When exporting an object we can choose the transformation type 'Matrix'
or 'trans/rot/scale' When exporting an animation we have the same choice
regarding the used transformation type.
However we must make sure that animations and objects use the same
transformation type within one colleda export. The user interface is
now reworked such that the correct settings are always guaranteed.
I also reworked the tool tips
Diffstat (limited to 'source/blender/collada/ExportSettings.h')
-rw-r--r-- | source/blender/collada/ExportSettings.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/collada/ExportSettings.h b/source/blender/collada/ExportSettings.h index 7112aeadb2a..ca118e4d14d 100644 --- a/source/blender/collada/ExportSettings.h +++ b/source/blender/collada/ExportSettings.h @@ -81,7 +81,8 @@ typedef struct ExportSettings { bool use_object_instantiation; bool use_blender_profile; bool sort_by_name; - BC_export_transformation_type export_transformation_type; + BC_export_transformation_type object_transformation_type; + BC_export_transformation_type animation_transformation_type; bool open_sim; bool limit_precision; @@ -232,9 +233,14 @@ class BCExportSettings { return export_settings.sort_by_name; } - BC_export_transformation_type get_export_transformation_type() + BC_export_transformation_type get_object_transformation_type() { - return export_settings.export_transformation_type; + return export_settings.object_transformation_type; + } + + BC_export_transformation_type get_animation_transformation_type() + { + return export_settings.animation_transformation_type; } bool get_open_sim() |