[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33146] trunk/blender/source/blender/ editors/object/object_add.c: store the view align setting even if its disabled & don' t edit the view quat when getting a euler from it.
Campbell Barton
ideasman42 at gmail.com
Thu Nov 18 01:26:00 CET 2010
Revision: 33146
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33146
Author: campbellbarton
Date: 2010-11-18 01:26:00 +0100 (Thu, 18 Nov 2010)
Log Message:
-----------
store the view align setting even if its disabled & don't edit the view quat when getting a euler from it.
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_add.c
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2010-11-17 22:32:25 UTC (rev 33145)
+++ trunk/blender/source/blender/editors/object/object_add.c 2010-11-18 00:26:00 UTC (rev 33146)
@@ -105,15 +105,16 @@
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
- rot[0] = rot[1] = rot[2] = 0.f;
+ else {
+ zero_v3(rot);
+ }
}
void ED_object_base_init_transform(bContext *C, Base *base, float *loc, float *rot)
@@ -258,8 +259,7 @@
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)
More information about the Bf-blender-cvs
mailing list