diff options
| author | Matt Ebb <matt@mke3.net> | 2010-04-06 06:05:02 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-04-06 06:05:02 +0400 |
| commit | ea7fdb55a3e8f088161b218b96220c1cba9380a1 (patch) | |
| tree | 1baa280c08ec1f1dcaf536b4664ddca3d55fe8b3 /source/blender/collada | |
| parent | 041cc016461aa52de30ce33d70af129c25fc9915 (diff) | |
Compile fix to collada after ED_object_apply_obmat() was removed.
Arystanbek, please feel free to fix if it's not ok :)
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 80c945c337c..66536e49dac 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -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); } } |