Compile fix to collada after ED_object_apply_obmat() was removed.

Arystanbek, please feel free to fix if it's not ok :)
This commit is contained in:
2010-04-06 02:05:02 +00:00
parent 041cc01646
commit ea7fdb55a3

View 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);
}
}