[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36695] trunk/blender/source/blender: remove some unused view3d members & added RV3D_VIEW_USER define.
Campbell Barton
ideasman42 at gmail.com
Sun May 15 05:42:29 CEST 2011
Revision: 36695
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36695
Author: campbellbarton
Date: 2011-05-15 03:42:28 +0000 (Sun, 15 May 2011)
Log Message:
-----------
remove some unused view3d members & added RV3D_VIEW_USER define.
Aligorith: replaced v3d->keyflags with ANIMFILTER_KEYS_LOCAL since v3d->keyflags couldn't be set anywhere and wasn't initialized.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/makesdna/DNA_view3d_types.h
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2011-05-15 03:07:07 UTC (rev 36694)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2011-05-15 03:42:28 UTC (rev 36695)
@@ -763,7 +763,7 @@
/* draw info beside axes in bottom left-corner:
* framenum, object name, bone name (if available), marker name (if available)
*/
-static void draw_selected_name(Scene *scene, Object *ob, View3D *v3d)
+static void draw_selected_name(Scene *scene, Object *ob)
{
char info[256], *markern;
short offset=30;
@@ -832,7 +832,7 @@
}
/* color depends on whether there is a keyframe */
- if (id_frame_has_keyframe((ID *)ob, /*BKE_curframe(scene)*/(float)(CFRA), v3d->keyflags))
+ if (id_frame_has_keyframe((ID *)ob, /*BKE_curframe(scene)*/(float)(CFRA), ANIMFILTER_KEYS_LOCAL))
UI_ThemeColor(TH_VERTEX_SELECT);
else
UI_ThemeColor(TH_TEXT_HI);
@@ -2469,7 +2469,7 @@
// needs to be done always, gridview is adjusted in drawgrid() now
rv3d->gridview= v3d->grid;
- if(rv3d->view==0 || rv3d->persp != RV3D_ORTHO) {
+ if((rv3d->view == RV3D_VIEW_USER) || (rv3d->persp != RV3D_ORTHO)) {
if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
drawfloor(scene, v3d, &grid_unit);
}
@@ -2641,7 +2641,7 @@
ob= OBACT;
if(U.uiflag & USER_DRAWVIEWINFO)
- draw_selected_name(scene, ob, v3d);
+ draw_selected_name(scene, ob);
/* XXX here was the blockhandlers for floating panels */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2011-05-15 03:07:07 UTC (rev 36694)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2011-05-15 03:42:28 UTC (rev 36695)
@@ -568,7 +568,7 @@
{
RegionView3D *rv3d= vod->rv3d;
- rv3d->view= 0; /* need to reset everytime because of view snapping */
+ rv3d->view= RV3D_VIEW_USER; /* need to reset everytime because of view snapping */
if (U.flag & USER_TRACKBALL) {
float phi, si, q1[4], dvec[3], newvec[3];
@@ -2218,7 +2218,7 @@
invert_qt(obact_quat);
mul_qt_qtqt(new_quat, new_quat, obact_quat);
- rv3d->view= view= 0;
+ rv3d->view= view= RV3D_VIEW_USER;
}
}
@@ -2430,7 +2430,7 @@
q1[1]= q1[2]= 0.0;
q1[3]= si;
mul_qt_qtqt(new_quat, rv3d->viewquat, q1);
- rv3d->view= 0;
+ rv3d->view= RV3D_VIEW_USER;
}
else if(orbitdir == V3D_VIEW_STEPDOWN || orbitdir == V3D_VIEW_STEPUP) {
/* horizontal axis */
@@ -2442,7 +2442,7 @@
q1[0]= (float)cos(phi);
mul_v3_fl(q1+1, sin(phi));
mul_qt_qtqt(new_quat, rv3d->viewquat, q1);
- rv3d->view= 0;
+ rv3d->view= RV3D_VIEW_USER;
}
smooth_view(C, CTX_wm_view3d(C), ar, NULL, NULL, NULL, new_quat, NULL, NULL);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_header.c 2011-05-15 03:07:07 UTC (rev 36694)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_header.c 2011-05-15 03:42:28 UTC (rev 36695)
@@ -522,9 +522,9 @@
block= uiLayoutGetBlock(row);
if(v3d->twflag & V3D_USE_MANIPULATOR) {
- uiDefIconButBitS(block, TOG, V3D_MANIP_TRANSLATE, B_MAN_TRANS, ICON_MAN_TRANS, 0,0,XIC,YIC, &v3d->twtype, 1.0, 0.0, 0, 0, "Translate manipulator mode");
- uiDefIconButBitS(block, TOG, V3D_MANIP_ROTATE, B_MAN_ROT, ICON_MAN_ROT, 0,0,XIC,YIC, &v3d->twtype, 1.0, 0.0, 0, 0, "Rotate manipulator mode");
- uiDefIconButBitS(block, TOG, V3D_MANIP_SCALE, B_MAN_SCALE, ICON_MAN_SCALE, 0,0,XIC,YIC, &v3d->twtype, 1.0, 0.0, 0, 0, "Scale manipulator mode");
+ uiDefIconButBitC(block, TOG, V3D_MANIP_TRANSLATE, B_MAN_TRANS, ICON_MAN_TRANS, 0,0,XIC,YIC, &v3d->twtype, 1.0, 0.0, 0, 0, "Translate manipulator mode");
+ uiDefIconButBitC(block, TOG, V3D_MANIP_ROTATE, B_MAN_ROT, ICON_MAN_ROT, 0,0,XIC,YIC, &v3d->twtype, 1.0, 0.0, 0, 0, "Rotate manipulator mode");
+ uiDefIconButBitC(block, TOG, V3D_MANIP_SCALE, B_MAN_SCALE, ICON_MAN_SCALE, 0,0,XIC,YIC, &v3d->twtype, 1.0, 0.0, 0, 0, "Scale manipulator mode");
}
if (v3d->twmode > (BIF_countTransformOrientation(C) - 1) + V3D_MANIP_CUSTOM) {
@@ -532,7 +532,7 @@
}
str_menu = BIF_menustringTransformOrientation(C, "Orientation");
- uiDefButS(block, MENU, B_MAN_MODE, str_menu,0,0,70 * dpi_fac, YIC, &v3d->twmode, 0, 0, 0, 0, "Transform Orientation");
+ uiDefButC(block, MENU, B_MAN_MODE, str_menu,0,0,70 * dpi_fac, YIC, &v3d->twmode, 0, 0, 0, 0, "Transform Orientation");
MEM_freeN((void *)str_menu);
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2011-05-15 03:07:07 UTC (rev 36694)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2011-05-15 03:42:28 UTC (rev 36695)
@@ -218,7 +218,7 @@
if((rv3d->viewlock & RV3D_LOCKED)==0) {
/* use existing if exists, means multiple calls to smooth view wont loose the original 'view' setting */
sms.orig_view= rv3d->sms ? rv3d->sms->orig_view : rv3d->view;
- rv3d->view= 0;
+ rv3d->view= RV3D_VIEW_USER;
}
sms.time_allowed= (double)U.smooth_viewtx / 1000.0;
@@ -1116,7 +1116,7 @@
float bmat[4][4];
float tmat[3][3];
- rv3d->view= 0; /* dont show the grid */
+ rv3d->view= RV3D_VIEW_USER; /* dont show the grid */
copy_m4_m4(bmat, ob->obmat);
normalize_m4(bmat);
@@ -1869,7 +1869,7 @@
cross_v3_v3v3(axis, alignaxis, norm);
axis_angle_to_quat( new_quat,axis, -angle);
- rv3d->view= 0;
+ rv3d->view= RV3D_VIEW_USER;
if (rv3d->persp==RV3D_CAMOB && v3d->camera) {
/* switch out of camera view */
Modified: trunk/blender/source/blender/makesdna/DNA_view3d_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_view3d_types.h 2011-05-15 03:07:07 UTC (rev 36694)
+++ trunk/blender/source/blender/makesdna/DNA_view3d_types.h 2011-05-15 03:42:28 UTC (rev 36695)
@@ -163,26 +163,21 @@
* OB_SHADED or OB_TEXTURE */
short drawtype;
short ob_centre_cursor; /* optional bool for 3d cursor to define center */
- short scenelock, around, pad3;
+ short scenelock, around;
short flag, flag2;
- short pivot_last; /* pivot_last is for rotating around the last edited element */
-
float lens, grid;
- float gridview; /* XXX deprecated, now in RegionView3D */
float near, far;
float ofs[3]; /* XXX deprecated */
float cursor[3];
- short gridlines, pad4;
- short gridflag;
- short gridsubdiv; /* Number of subdivisions in the grid between each highlighted grid line */
short modeselect;
- short keyflags; /* flags for display of keyframes */
-
+ short gridlines;
+ short gridsubdiv; /* Number of subdivisions in the grid between each highlighted grid line */
+ char gridflag;
+
/* transform widget info */
- short twtype, twmode, twflag;
- short twdrawflag; /* XXX deprecated */
+ char twtype, twmode, twflag, pad2[2];
/* afterdraw, for xray & transparent */
struct ListBase afterdraw_transp;
@@ -195,7 +190,7 @@
char ndofmode; /* mode of transform for 6DOF devices -1 not found, 0 normal, 1 fly, 2 ob transform */
char ndoffilter; /* filter for 6DOF devices 0 normal, 1 dominant */
- void *properties_storage; /* Nkey panel stores stuff here, not in file */
+ void *properties_storage; /* Nkey panel stores stuff here (runtime only!) */
/* XXX depricated? */
struct bGPdata *gpd; /* Grease-Pencil Data (annotation layers) */
@@ -231,10 +226,11 @@
#define RV3D_BOXCLIP 4
/* RegionView3d->view */
-#define RV3D_VIEW_FRONT 1
+#define RV3D_VIEW_USER 0
+#define RV3D_VIEW_FRONT 1
#define RV3D_VIEW_BACK 2
#define RV3D_VIEW_LEFT 3
-#define RV3D_VIEW_RIGHT 4
+#define RV3D_VIEW_RIGHT 4
#define RV3D_VIEW_TOP 5
#define RV3D_VIEW_BOTTOM 6
#define RV3D_VIEW_PERSPORTHO 7
More information about the Bf-blender-cvs
mailing list