diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-11-18 03:26:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-18 03:26:00 +0300 |
| commit | 50778a3ea5fd398596b300e507f0b0a4b933dd3c (patch) | |
| tree | ee55e1ab31830a4b5f464309227a606087384815 /source | |
| parent | 9183f20fb4828bbd562cb6a2b8f65c8750c3c27b (diff) | |
store the view align setting even if its disabled & don't edit the view quat when getting a euler from it.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 115cdb09b87..87906cd9629 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -105,15 +105,16 @@ void ED_object_location_from_view(bContext *C, float *loc) void ED_object_rotation_from_view(bContext *C, float *rot) { - RegionView3D *rv3d= ED_view3d_context_rv3d(C); - + RegionView3D *rv3d= CTX_wm_region_view3d(C); if(rv3d) { - rv3d->viewquat[0]= -rv3d->viewquat[0]; - quat_to_eul( rot, rv3d->viewquat); - rv3d->viewquat[0]= -rv3d->viewquat[0]; + float quat[4]; + copy_qt_qt(quat, rv3d->viewquat); + quat[0]= -quat[0]; + quat_to_eul(rot, quat); + } + else { + zero_v3(rot); } - else - rot[0] = rot[1] = rot[2] = 0.f; } void ED_object_base_init_transform(bContext *C, Base *base, float *loc, float *rot) @@ -258,8 +259,7 @@ int ED_object_add_generic_get_opts(bContext *C, wmOperator *op, float *loc, floa view_align = RNA_boolean_get(op->ptr, "view_align"); else { view_align = U.flag & USER_ADD_VIEWALIGNED; - if(view_align) - RNA_boolean_set(op->ptr, "view_align", 1); + RNA_boolean_set(op->ptr, "view_align", view_align); } if (view_align) |