[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28026] trunk/blender/source/blender/ collada/DocumentImporter.cpp: Compile fix to collada after ED_object_apply_obmat() was removed.
Matt Ebb
matt at mke3.net
Tue Apr 6 04:05:14 CEST 2010
Revision: 28026
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28026
Author: broken
Date: 2010-04-06 04:05:02 +0200 (Tue, 06 Apr 2010)
Log Message:
-----------
Compile fix to collada after ED_object_apply_obmat() was removed.
Arystanbek, please feel free to fix if it's not ok :)
Modified Paths:
--------------
trunk/blender/source/blender/collada/DocumentImporter.cpp
Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.cpp 2010-04-06 01:34:55 UTC (rev 28025)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp 2010-04-06 02:05:02 UTC (rev 28026)
@@ -211,7 +211,7 @@
// mul_m4_m4m4(ob->obmat, mat, par->obmat);
// apply child obmat (i.e. decompose into rot/loc/size)
- ED_object_apply_obmat(ob);
+ object_apply_mat4(ob, ob->obmat);
// compute parentinv
what_does_parent(sce, ob, &workob);
@@ -2299,7 +2299,7 @@
TransformReader::get_node_mat(mat, node, &uid_animated_map, ob);
if (ob) {
copy_m4_m4(ob->obmat, mat);
- ED_object_apply_obmat(ob);
+ object_apply_mat4(ob, ob->obmat);
}
}
More information about the Bf-blender-cvs
mailing list