[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32953] trunk/blender/source/blender/ collada: missed these last commit, searched all uses of this function and think this should work now.

[Campbell Barton]

Revision: 32953
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32953
Author:   campbellbarton
Date:     2010-11-09 00:34:09 +0100 (Tue, 09 Nov 2010)

Log Message:
-----------
missed these last commit, searched all uses of this function and think this should work now.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/SkinInfo.cpp
    trunk/blender/source/blender/collada/collada_utils.cpp

Modified: trunk/blender/source/blender/collada/SkinInfo.cpp
===================================================================
--- trunk/blender/source/blender/collada/SkinInfo.cpp	2010-11-08 23:13:49 UTC (rev 32952)
+++ trunk/blender/source/blender/collada/SkinInfo.cpp	2010-11-08 23:34:09 UTC (rev 32953)
@@ -215,7 +215,7 @@
 	((ArmatureModifierData *)md)->object = ob_arm;
 
 	copy_m4_m4(ob->obmat, bind_shape_matrix);
-	object_apply_mat4(ob, ob->obmat, 0);
+	object_apply_mat4(ob, ob->obmat, 0, 0);
 #if 1
 	bc_set_parent(ob, ob_arm, C);
 #else

Modified: trunk/blender/source/blender/collada/collada_utils.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_utils.cpp	2010-11-08 23:13:49 UTC (rev 32952)
+++ trunk/blender/source/blender/collada/collada_utils.cpp	2010-11-08 23:34:09 UTC (rev 32953)
@@ -88,7 +88,7 @@
 	}
 	
 	// apply child obmat (i.e. decompose it into rot/loc/size)
-	object_apply_mat4(ob, ob->obmat, 0);
+	object_apply_mat4(ob, ob->obmat, 0, 0);
 
 	// compute parentinv
 	what_does_parent(sce, ob, &workob);