[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27599] branches/render25/source/blender: remove ED_object_apply_obmat(ob) in favor of object_apply_mat4(ob, mat), ED_object_apply_obmat wasnt doing quat/axis-angle or non xyz rotations.
Campbell Barton
ideasman42 at gmail.com
Thu Mar 18 12:37:43 CET 2010
Revision: 27599
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27599
Author: campbellbarton
Date: 2010-03-18 12:37:43 +0100 (Thu, 18 Mar 2010)
Log Message:
-----------
remove ED_object_apply_obmat(ob) in favor of object_apply_mat4(ob, mat), ED_object_apply_obmat wasnt doing quat/axis-angle or non xyz rotations.
Modified Paths:
--------------
branches/render25/source/blender/editors/armature/editarmature.c
branches/render25/source/blender/editors/include/ED_object.h
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/object/object_edit.c
branches/render25/source/blender/editors/object/object_relations.c
branches/render25/source/blender/editors/object/object_transform.c
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: branches/render25/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/render25/source/blender/editors/armature/editarmature.c 2010-03-18 11:34:20 UTC (rev 27598)
+++ branches/render25/source/blender/editors/armature/editarmature.c 2010-03-18 11:37:43 UTC (rev 27599)
@@ -545,7 +545,7 @@
/* apply current transform from parent (not yet destroyed),
* then calculate new parent inverse matrix
*/
- ED_object_apply_obmat(ob);
+ object_apply_mat4(ob, ob->obmat);
what_does_parent(scene, ob, &workob);
invert_m4_m4(ob->parentinv, workob.obmat);
Modified: branches/render25/source/blender/editors/include/ED_object.h
===================================================================
--- branches/render25/source/blender/editors/include/ED_object.h 2010-03-18 11:34:20 UTC (rev 27598)
+++ branches/render25/source/blender/editors/include/ED_object.h 2010-03-18 11:37:43 UTC (rev 27599)
@@ -62,7 +62,6 @@
void ED_base_object_free_and_unlink(struct Scene *scene, struct Base *base);
-void ED_object_apply_obmat(struct Object *ob);
/* single object duplicate, if dupflag==0, fully linked, else it uses the flags given */
struct Base *ED_object_add_duplicate(struct Scene *scene, struct Base *base, int dupflag);
Modified: branches/render25/source/blender/editors/object/object_add.c
===================================================================
--- branches/render25/source/blender/editors/object/object_add.c 2010-03-18 11:34:20 UTC (rev 27598)
+++ branches/render25/source/blender/editors/object/object_add.c 2010-03-18 11:37:43 UTC (rev 27599)
@@ -1118,7 +1118,7 @@
ob->lay= base->lay;
copy_m4_m4(ob->obmat, dob->mat);
- ED_object_apply_obmat(ob);
+ object_apply_mat4(ob, ob->obmat);
}
copy_object_set_idnew(C, 0);
Modified: branches/render25/source/blender/editors/object/object_edit.c
===================================================================
--- branches/render25/source/blender/editors/object/object_edit.c 2010-03-18 11:34:20 UTC (rev 27598)
+++ branches/render25/source/blender/editors/object/object_edit.c 2010-03-18 11:37:43 UTC (rev 27599)
@@ -150,34 +150,6 @@
static bContext *C;
static void error_libdata() {}
-/* ********************************** */
-
-/* --------------------------------- */
-
-void ED_object_apply_obmat(Object *ob)
-{
- float mat[3][3], imat[3][3], tmat[3][3];
-
- /* from obmat to loc rot size */
-
- if(ob==NULL) return;
- copy_m3_m4(mat, ob->obmat);
-
- VECCOPY(ob->loc, ob->obmat[3]);
-
- mat3_to_eul( ob->rot,mat);
- eul_to_mat3( tmat,ob->rot);
-
- invert_m3_m3(imat, tmat);
-
- mul_m3_m3m3(tmat, imat, mat);
-
- ob->size[0]= tmat[0][0];
- ob->size[1]= tmat[1][1];
- ob->size[2]= tmat[2][2];
-
-}
-
/* ********* clear/set restrict view *********/
static int object_restrictview_clear_exec(bContext *C, wmOperator *op)
{
Modified: branches/render25/source/blender/editors/object/object_relations.c
===================================================================
--- branches/render25/source/blender/editors/object/object_relations.c 2010-03-18 11:34:20 UTC (rev 27598)
+++ branches/render25/source/blender/editors/object/object_relations.c 2010-03-18 11:37:43 UTC (rev 27599)
@@ -430,7 +430,7 @@
else if(type == 1) {
ob->parent= NULL;
ob->track= NULL;
- ED_object_apply_obmat(ob);
+ object_apply_mat4(ob, ob->obmat);
}
else if(type == 2)
unit_m4(ob->parentinv);
@@ -572,7 +572,7 @@
Object workob;
/* apply transformation of previous parenting */
- ED_object_apply_obmat(ob);
+ object_apply_mat4(ob, ob->obmat);
/* set the parent (except for follow-path constraint option) */
if(partype != PAR_PATH_CONST)
@@ -887,7 +887,7 @@
}
if(type == 1)
- ED_object_apply_obmat(ob);
+ object_apply_mat4(ob, ob->obmat);
}
CTX_DATA_END;
Modified: branches/render25/source/blender/editors/object/object_transform.c
===================================================================
--- branches/render25/source/blender/editors/object/object_transform.c 2010-03-18 11:34:20 UTC (rev 27598)
+++ branches/render25/source/blender/editors/object/object_transform.c 2010-03-18 11:37:43 UTC (rev 27599)
@@ -392,7 +392,7 @@
/* a change was made, adjust the children to compensate */
for(ob_child=bmain->object.first; ob_child; ob_child=ob_child->id.next) {
if(ob_child->parent == ob) {
- ED_object_apply_obmat(ob_child);
+ object_apply_mat4(ob_child, ob_child->obmat);
what_does_parent(scene, ob_child, &workob);
invert_m4_m4(ob_child->parentinv, workob.obmat);
}
Modified: branches/render25/source/blender/makesrna/intern/rna_object.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_object.c 2010-03-18 11:34:20 UTC (rev 27598)
+++ branches/render25/source/blender/makesrna/intern/rna_object.c 2010-03-18 11:37:43 UTC (rev 27599)
@@ -125,7 +125,7 @@
void rna_Object_matrix_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
- ED_object_apply_obmat(ptr->id.data);
+ object_apply_mat4(ptr->id.data, ((Object *)ptr->id.data)->obmat);
rna_Object_update(bmain, scene, ptr);
}
Modified: branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c 2010-03-18 11:34:20 UTC (rev 27598)
+++ branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c 2010-03-18 11:37:43 UTC (rev 27599)
@@ -225,7 +225,6 @@
void ED_mesh_update(struct Mesh *mesh, struct bContext *C){}
int ED_mesh_color_add(struct bContext *C, struct Scene *scene, struct Object *ob, struct Mesh *me){return 0;}
int ED_mesh_uv_texture_add(struct bContext *C, struct Scene *scene, struct Object *ob, struct Mesh *me){return 0;}
-void ED_object_apply_obmat(struct Object *ob){}
void ED_object_constraint_dependency_update(struct Scene *scene, struct Object *ob){}
void ED_object_constraint_update(struct Object *ob){}
struct bDeformGroup *ED_vgroup_add_name(struct Object *ob, char *name){return (struct bDeformGroup *) NULL;}
More information about the Bf-blender-cvs
mailing list