diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-25 11:12:29 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-25 11:12:29 +0400 |
| commit | 904f82b49fb8a5169deaab707fe01333c077119f (patch) | |
| tree | 72cc53a2cae2ccb6ce1a1180a0bbe65eb6b20146 /source/blender/makesrna/intern/rna_object.c | |
| parent | 3320b6fdd6ac436ffa55567d0577791ffa5e736c (diff) | |
bugfix [#24376] Fly mode disturbs the rotation or scale of the camera object
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index c29ad0d9adf..599aa4abc91 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -143,7 +143,8 @@ static void rna_Object_internal_update(Main *bmain, Scene *scene, PointerRNA *pt static void rna_Object_matrix_world_update(Main *bmain, Scene *scene, PointerRNA *ptr) { - object_apply_mat4(ptr->id.data, ((Object *)ptr->id.data)->obmat); + /* dont use compat so we get pradictable rotation */ + object_apply_mat4(ptr->id.data, ((Object *)ptr->id.data)->obmat, FALSE); rna_Object_internal_update(bmain, scene, ptr); } @@ -177,7 +178,8 @@ static void rna_Object_matrix_local_set(PointerRNA *ptr, const float values[16]) copy_m4_m4(ob->obmat, (float(*)[4])values); } - object_apply_mat4(ob, ob->obmat); + /* dont use compat so we get pradictable rotation */ + object_apply_mat4(ob, ob->obmat, FALSE); } void rna_Object_internal_update_data(Main *bmain, Scene *scene, PointerRNA *ptr) |