[Bf-blender-cvs] [d83d376c024] master: cleanup: Collada exporter renamed 'transrotloc' to 'decomposed'
Gaia Clary
noreply at git.blender.org
Mon May 27 18:39:14 CEST 2019
Commit: d83d376c02412b14dd16493ea09ac77a27a9ca30
Author: Gaia Clary
Date: Mon May 27 18:35:34 2019 +0200
Branches: master
https://developer.blender.org/rBd83d376c02412b14dd16493ea09ac77a27a9ca30
cleanup: Collada exporter renamed 'transrotloc' to 'decomposed'
The collada exporter allows to export transforms either as Matrix
or as a decomposition of Translation, Rotation aand Scale.
The decomposition option was falsely named "TransRotLoc".
I renamed it to the much more descriptive word "Decomposed".
The tooltip already contains sufficient information, so there
is no need to change that.
===================================================================
M source/blender/collada/ExportSettings.h
M source/blender/collada/TransformWriter.cpp
M source/blender/editors/io/io_collada.c
===================================================================
diff --git a/source/blender/collada/ExportSettings.h b/source/blender/collada/ExportSettings.h
index ca118e4d14d..36f3ea40da9 100644
--- a/source/blender/collada/ExportSettings.h
+++ b/source/blender/collada/ExportSettings.h
@@ -37,7 +37,7 @@ typedef enum BC_export_mesh_type {
typedef enum BC_export_transformation_type {
BC_TRANSFORMATION_TYPE_MATRIX,
- BC_TRANSFORMATION_TYPE_TRANSROTLOC,
+ BC_TRANSFORMATION_TYPE_DECOMPOSED,
} BC_export_transformation_type;
typedef enum BC_export_animation_type {
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp
index fbf75552b85..a80d02ab9a3 100644
--- a/source/blender/collada/TransformWriter.cpp
+++ b/source/blender/collada/TransformWriter.cpp
@@ -92,7 +92,7 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node &node,
node.addMatrix("transform", d_obmat);
break;
}
- case BC_TRANSFORMATION_TYPE_TRANSROTLOC: {
+ case BC_TRANSFORMATION_TYPE_DECOMPOSED: {
float loc[3], rot[3], scale[3];
bc_decompose(f_obmat, loc, rot, NULL, scale);
if (limit_precision) {
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c
index fc3bf74f386..c5c24051299 100644
--- a/source/blender/editors/io/io_collada.c
+++ b/source/blender/editors/io/io_collada.c
@@ -223,10 +223,10 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
if (export_animation_type != BC_ANIMATION_EXPORT_SAMPLES) {
// When curves are exported then we can not export as matrix
- export_settings.animation_transformation_type = BC_TRANSFORMATION_TYPE_TRANSROTLOC;
+ export_settings.animation_transformation_type = BC_TRANSFORMATION_TYPE_DECOMPOSED;
}
- if (export_settings.animation_transformation_type != BC_TRANSFORMATION_TYPE_TRANSROTLOC) {
+ if (export_settings.animation_transformation_type != BC_TRANSFORMATION_TYPE_DECOMPOSED) {
// Can not export smooth curves when Matrix export is enabled.
export_settings.keep_smooth_curves = false;
}
@@ -397,7 +397,7 @@ static void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr)
uiItemR(row, imfptr, "keep_smooth_curves", 0, NULL, ICON_NONE);
uiLayoutSetEnabled(row,
include_animations &&
- (animation_transformation_type == BC_TRANSFORMATION_TYPE_TRANSROTLOC ||
+ (animation_transformation_type == BC_TRANSFORMATION_TYPE_DECOMPOSED ||
animation_type == BC_ANIMATION_EXPORT_KEYS));
row = uiLayoutColumn(box, false);
@@ -496,11 +496,11 @@ void WM_OT_collada_export(wmOperatorType *ot)
0,
"Matrix",
"Use <matrix> representation for exported transformations"},
- {BC_TRANSFORMATION_TYPE_TRANSROTLOC,
- "transrotloc",
+ {BC_TRANSFORMATION_TYPE_DECOMPOSED,
+ "decomposed",
0,
- "TransRotLoc",
- "Use <translate>, <rotate>, <scale> representation for exported transformations"},
+ "Decomposed",
+ "Use <rotate>, <translate> and <scale> representation for exported transformations"},
{0, NULL, 0, NULL, NULL}};
static const EnumPropertyItem prop_bc_export_animation_type[] = {
More information about the Bf-blender-cvs
mailing list