[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32697] trunk/blender/source/blender/ collada: Compile fix after math API change from r32694

Nathan Letwory nathan at letworyinteractive.com
Mon Oct 25 09:36:14 CEST 2010


Revision: 32697
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32697
Author:   jesterking
Date:     2010-10-25 09:36:14 +0200 (Mon, 25 Oct 2010)

Log Message:
-----------
Compile fix after math API change from r32694

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

Modified: trunk/blender/source/blender/collada/AnimationImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationImporter.cpp	2010-10-25 07:28:57 UTC (rev 32696)
+++ trunk/blender/source/blender/collada/AnimationImporter.cpp	2010-10-25 07:36:14 UTC (rev 32697)
@@ -403,7 +403,7 @@
 	TransformReader::get_node_mat(mat, node, &uid_animated_map, ob);
 	if (ob) {
 		copy_m4_m4(ob->obmat, mat);
-		object_apply_mat4(ob, ob->obmat);
+		object_apply_mat4(ob, ob->obmat, 0);
 	}
 }
 

Modified: trunk/blender/source/blender/collada/SkinInfo.cpp
===================================================================
--- trunk/blender/source/blender/collada/SkinInfo.cpp	2010-10-25 07:28:57 UTC (rev 32696)
+++ trunk/blender/source/blender/collada/SkinInfo.cpp	2010-10-25 07:36:14 UTC (rev 32697)
@@ -215,7 +215,7 @@
 	((ArmatureModifierData *)md)->object = ob_arm;
 
 	copy_m4_m4(ob->obmat, bind_shape_matrix);
-	object_apply_mat4(ob, ob->obmat);
+	object_apply_mat4(ob, ob->obmat, 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-10-25 07:28:57 UTC (rev 32696)
+++ trunk/blender/source/blender/collada/collada_utils.cpp	2010-10-25 07:36:14 UTC (rev 32697)
@@ -88,7 +88,7 @@
 	}
 	
 	// apply child obmat (i.e. decompose it into rot/loc/size)
-	object_apply_mat4(ob, ob->obmat);
+	object_apply_mat4(ob, ob->obmat, 0);
 
 	// compute parentinv
 	what_does_parent(sce, ob, &workob);





More information about the Bf-blender-cvs mailing list