[Bf-blender-cvs] [dac5438] master: COLLADA: Removed obsolete Export select option 'Both' which created invalid data (duplicate transformation information for nodes)

[Gaia Clary]

Commit: dac543856205a68975cb61b80769574b5986da18
Author: Gaia Clary
Date:   Wed Nov 2 14:11:46 2016 +0100
Branches: master
https://developer.blender.org/rBdac543856205a68975cb61b80769574b5986da18

COLLADA: Removed obsolete Export select option 'Both' which created invalid data (duplicate transformation information for nodes)

===================================================================

M	source/blender/collada/TransformWriter.cpp
M	source/blender/collada/collada.h
M	source/blender/editors/io/io_collada.c

===================================================================

diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp
index b16e2e2..908111e 100644
--- a/source/blender/collada/TransformWriter.cpp
+++ b/source/blender/collada/TransformWriter.cpp
@@ -113,11 +113,6 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob, B
 			node.addMatrix("transform",d_obmat);
 			break;
 		}
-		case BC_TRANSFORMATION_TYPE_BOTH:
-		{
-			node.addMatrix("transform",d_obmat);
-			/* fall-through */
-		}
 		case BC_TRANSFORMATION_TYPE_TRANSROTLOC:
 		{
 			float loc[3], rot[3], scale[3];
diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h
index 0017c66..a441660 100644
--- a/source/blender/collada/collada.h
+++ b/source/blender/collada/collada.h
@@ -43,8 +43,7 @@ typedef enum BC_export_mesh_type {
 
 typedef enum BC_export_transformation_type {
 	BC_TRANSFORMATION_TYPE_MATRIX,
-	BC_TRANSFORMATION_TYPE_TRANSROTLOC,
-	BC_TRANSFORMATION_TYPE_BOTH
+	BC_TRANSFORMATION_TYPE_TRANSROTLOC
 } BC_export_transformation_type;
 
 struct bContext;
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c
index 8659100..baae92f 100644
--- a/source/blender/editors/io/io_collada.c
+++ b/source/blender/editors/io/io_collada.c
@@ -305,7 +305,6 @@ void WM_OT_collada_export(wmOperatorType *ot)
 	static EnumPropertyItem prop_bc_export_transformation_type[] = {
 		{BC_TRANSFORMATION_TYPE_MATRIX, "matrix", 0, "Matrix", "Use <matrix> to specify transformations"},
 		{BC_TRANSFORMATION_TYPE_TRANSROTLOC, "transrotloc", 0, "TransRotLoc", "Use <translate>, <rotate>, <scale> to specify transformations"},
-		{BC_TRANSFORMATION_TYPE_BOTH, "both", 0, "Both", "Use <matrix> AND <translate>, <rotate>, <scale> to specify transformations"},
 		{0, NULL, 0, NULL, NULL}
 	};