[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32951] trunk/blender/source/blender: bugfix [#24616] Apply Visual Transform doesn't always apply location
Campbell Barton
ideasman42 at gmail.com
Mon Nov 8 23:32:29 CET 2010
Revision: 32951
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32951
Author: campbellbarton
Date: 2010-11-08 23:32:28 +0100 (Mon, 08 Nov 2010)
Log Message:
-----------
bugfix [#24616] Apply Visual Transform doesn't always apply location
- object updates were not being flushed, so children weren't updating.
- apply the matrix relative to the parent, added this as an option to object_apply_mat4() which allows assigning the worldspace matrix in python without worrying about the parent.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_object.h
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
Modified: trunk/blender/source/blender/blenkernel/BKE_object.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_object.h 2010-11-08 21:13:44 UTC (rev 32950)
+++ trunk/blender/source/blender/blenkernel/BKE_object.h 2010-11-08 22:32:28 UTC (rev 32951)
@@ -101,7 +101,7 @@
void object_mat3_to_rot(struct Object *ob, float mat[][3], short use_compat);
void object_to_mat3(struct Object *ob, float mat[][3]);
void object_to_mat4(struct Object *ob, float mat[][4]);
-void object_apply_mat4(struct Object *ob, float mat[][4], short use_compat);
+void object_apply_mat4(struct Object *ob, float mat[][4], const short use_compat, const short use_parent);
void set_no_parent_ipo(int val);
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2010-11-08 21:13:44 UTC (rev 32950)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2010-11-08 22:32:28 UTC (rev 32951)
@@ -1550,7 +1550,7 @@
if(gob) {
ob->rotmode= target->rotmode;
mul_m4_m4m4(ob->obmat, target->obmat, gob->obmat);
- object_apply_mat4(ob, ob->obmat, FALSE);
+ object_apply_mat4(ob, ob->obmat, FALSE, TRUE);
}
else {
copy_object_transform(ob, target);
@@ -1694,11 +1694,25 @@
}
/* see pchan_apply_mat4() for the equivalent 'pchan' function */
-void object_apply_mat4(Object *ob, float mat[][4], short use_compat)
+void object_apply_mat4(Object *ob, float mat[][4], const short use_compat, const short use_parent)
{
float rot[3][3];
- mat4_to_loc_rot_size(ob->loc, rot, ob->size, mat);
- object_mat3_to_rot(ob, rot, use_compat);
+
+ if(use_parent && ob->parent) {
+ float rmat[4][4], diff_mat[4][4], imat[4][4];
+ mul_m4_m4m4(diff_mat, ob->parentinv, ob->parent->obmat);
+ invert_m4_m4(imat, diff_mat);
+ mul_m4_m4m4(rmat, mat, imat); /* get the parent relative matrix */
+ object_apply_mat4(ob, rmat, use_compat, FALSE);
+
+ /* same as below, use rmat rather then mat */
+ mat4_to_loc_rot_size(ob->loc, rot, ob->size, rmat);
+ object_mat3_to_rot(ob, rot, use_compat);
+ }
+ else {
+ mat4_to_loc_rot_size(ob->loc, rot, ob->size, mat);
+ object_mat3_to_rot(ob, rot, use_compat);
+ }
}
void object_to_mat3(Object *ob, float mat[][3]) /* no parent */
@@ -2127,7 +2141,7 @@
copy_m3_m4(originmat, tmat);
// origin, voor help line
- if( (ob->partype & 15)==PARSKEL ) {
+ if( (ob->partype & PARTYPE)==PARSKEL ) {
VECCOPY(ob->orig, par->obmat[3]);
}
else {
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c 2010-11-08 21:13:44 UTC (rev 32950)
+++ trunk/blender/source/blender/editors/armature/editarmature.c 2010-11-08 22:32:28 UTC (rev 32951)
@@ -534,7 +534,7 @@
/* apply current transform from parent (not yet destroyed),
* then calculate new parent inverse matrix
*/
- object_apply_mat4(ob, ob->obmat, FALSE);
+ object_apply_mat4(ob, ob->obmat, FALSE, FALSE);
what_does_parent(scene, ob, &workob);
invert_m4_m4(ob->parentinv, workob.obmat);
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2010-11-08 21:13:44 UTC (rev 32950)
+++ trunk/blender/source/blender/editors/object/object_add.c 2010-11-08 22:32:28 UTC (rev 32951)
@@ -982,7 +982,7 @@
ob->lay= base->lay;
copy_m4_m4(ob->obmat, dob->mat);
- object_apply_mat4(ob, ob->obmat, FALSE);
+ object_apply_mat4(ob, ob->obmat, FALSE, FALSE);
}
copy_object_set_idnew(C, 0);
Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c 2010-11-08 21:13:44 UTC (rev 32950)
+++ trunk/blender/source/blender/editors/object/object_relations.c 2010-11-08 22:32:28 UTC (rev 32951)
@@ -431,7 +431,7 @@
}
else if(type == 1) {
ob->parent= NULL;
- object_apply_mat4(ob, ob->obmat, TRUE);
+ object_apply_mat4(ob, ob->obmat, TRUE, FALSE);
}
else if(type == 2)
unit_m4(ob->parentinv);
@@ -906,7 +906,7 @@
}
if(type == 1)
- object_apply_mat4(ob, ob->obmat, TRUE);
+ object_apply_mat4(ob, ob->obmat, TRUE, TRUE);
}
CTX_DATA_END;
Modified: trunk/blender/source/blender/editors/object/object_transform.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_transform.c 2010-11-08 21:13:44 UTC (rev 32950)
+++ trunk/blender/source/blender/editors/object/object_transform.c 2010-11-08 22:32:28 UTC (rev 32951)
@@ -391,7 +391,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) {
- object_apply_mat4(ob_child, ob_child->obmat, TRUE);
+ object_apply_mat4(ob_child, ob_child->obmat, TRUE, FALSE);
what_does_parent(scene, ob_child, &workob);
invert_m4_m4(ob_child->parentinv, workob.obmat);
}
@@ -577,9 +577,12 @@
CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
where_is_object(scene, ob);
- object_apply_mat4(ob, ob->obmat, TRUE);
+ object_apply_mat4(ob, ob->obmat, TRUE, TRUE);
where_is_object(scene, ob);
-
+
+ /* update for any children that may get moved */
+ DAG_id_flush_update(&ob->id, OB_RECALC_OB);
+
change = 1;
}
CTX_DATA_END;
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_fly.c 2010-11-08 21:13:44 UTC (rev 32950)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_fly.c 2010-11-08 22:32:28 UTC (rev 32951)
@@ -794,7 +794,7 @@
view3d_persp_mat4(rv3d, view_mat);
mul_m4_m4m4(diff_mat, prev_view_imat, view_mat);
mul_m4_m4m4(parent_mat, fly->root_parent->obmat, diff_mat);
- object_apply_mat4(fly->root_parent, parent_mat, TRUE);
+ object_apply_mat4(fly->root_parent, parent_mat, TRUE, FALSE);
// where_is_object(scene, fly->root_parent);
@@ -812,7 +812,7 @@
else {
float view_mat[4][4];
view3d_persp_mat4(rv3d, view_mat);
- object_apply_mat4(v3d->camera, view_mat, TRUE);
+ object_apply_mat4(v3d->camera, view_mat, TRUE, FALSE);
id_key= &v3d->camera->id;
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c 2010-11-08 21:13:44 UTC (rev 32950)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c 2010-11-08 22:32:28 UTC (rev 32951)
@@ -144,7 +144,7 @@
static void rna_Object_matrix_world_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
/* dont use compat so we get pradictable rotation */
- object_apply_mat4(ptr->id.data, ((Object *)ptr->id.data)->obmat, FALSE);
+ object_apply_mat4(ptr->id.data, ((Object *)ptr->id.data)->obmat, FALSE, TRUE);
rna_Object_internal_update(bmain, scene, ptr);
}
@@ -179,7 +179,7 @@
}
/* dont use compat so we get pradictable rotation */
- object_apply_mat4(ob, ob->obmat, FALSE);
+ object_apply_mat4(ob, ob->obmat, FALSE, FALSE);
}
void rna_Object_internal_update_data(Main *bmain, Scene *scene, PointerRNA *ptr)
More information about the Bf-blender-cvs
mailing list