Compile fix to collada after ED_object_apply_obmat() was removed.
authorMatt Ebb <matt@mke3.net>
Tue, 6 Apr 2010 02:05:02 +0000 (02:05 +0000)
committerMatt Ebb <matt@mke3.net>
Tue, 6 Apr 2010 02:05:02 +0000 (02:05 +0000)
Arystanbek, please feel free to fix if it's not ok :)

source/blender/collada/DocumentImporter.cpp

index 80c945c337c73d8379629283b0e2f4b0ee0bdbbc..66536e49dac9cbbe7a4e49b1eca7c8b067fd8a2b 100644 (file)
@@ -211,7 +211,7 @@ static int set_parent(Object *ob, Object *par, bContext *C)
        // 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 @@ public:
                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);
                }
        }