[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54477] trunk/blender/source/blender/ collada/TransformWriter.cpp: [#34062] Collada: fixed redundant transform information and order of creation for the loc/ rot/trans

[Gaia Clary]

Revision: 54477
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54477
Author:   gaiaclary
Date:     2013-02-11 22:45:48 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
[#34062] Collada: fixed redundant transform information and order of creation for the loc/rot/trans

Modified Paths:
--------------
    trunk/blender/source/blender/collada/TransformWriter.cpp

Modified: trunk/blender/source/blender/collada/TransformWriter.cpp
===================================================================
--- trunk/blender/source/blender/collada/TransformWriter.cpp	2013-02-11 22:41:11 UTC (rev 54476)
+++ trunk/blender/source/blender/collada/TransformWriter.cpp	2013-02-11 22:45:48 UTC (rev 54477)
@@ -51,10 +51,10 @@
 	converter->mat4_to_dae_double(dmat, local);
 
 	TransformBase::decompose(local, loc, rot, NULL, scale);
-	if (node.getType() == COLLADASW::Node::JOINT)
+	//if (node.getType() == COLLADASW::Node::JOINT)
 	node.addMatrix("transform", dmat);
-	else
-	add_transform(node, loc, rot, scale);
+	//else
+	//add_transform(node, loc, rot, scale);
 }
 
 void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob)
@@ -115,7 +115,7 @@
 	double d_obmat[4][4];	
 	converter.mat4_to_dae_double(d_obmat, ob->obmat);
 	node.addMatrix("transform",d_obmat);
-	add_transform(node, ob->loc, ob->rot, ob->size);
+	//add_transform(node, ob->loc, ob->rot, ob->size);
 }
 
 void TransformWriter::add_node_transform_identity(COLLADASW::Node& node)
@@ -131,10 +131,10 @@
 	node.addRotateY("rotationY", COLLADABU::Math::Utils::radToDegF(rot[1]));
 	node.addRotateX("rotationX", COLLADABU::Math::Utils::radToDegF(rot[0]));
 #endif
+	node.addTranslate("location", loc[0], loc[1], loc[2]);
 	node.addRotateZ("rotationZ", RAD2DEGF(rot[2]));
 	node.addRotateY("rotationY", RAD2DEGF(rot[1]));
 	node.addRotateX("rotationX", RAD2DEGF(rot[0]));
 	node.addScale("scale", scale[0], scale[1], scale[2]);
-	node.addTranslate("location", loc[0], loc[1], loc[2]);
 
 }