[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45148] trunk/blender/source/blender/ editors/space_view3d: style cleanup: mostly whitespace around operators
Campbell Barton
ideasman42 at gmail.com
Mon Mar 26 01:54:39 CEST 2012
Revision: 45148
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45148
Author: campbellbarton
Date: 2012-03-25 23:54:33 +0000 (Sun, 25 Mar 2012)
Log Message:
-----------
style cleanup: mostly whitespace around operators
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/drawanimviz.c
trunk/blender/source/blender/editors/space_view3d/drawarmature.c
trunk/blender/source/blender/editors/space_view3d/drawmesh.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/drawvolume.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
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_fly.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
Modified: trunk/blender/source/blender/editors/space_view3d/drawanimviz.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawanimviz.c 2012-03-25 23:19:21 UTC (rev 45147)
+++ trunk/blender/source/blender/editors/space_view3d/drawanimviz.c 2012-03-25 23:54:33 UTC (rev 45148)
@@ -70,7 +70,7 @@
/* Set up drawing environment for drawing motion paths */
void draw_motion_paths_init(View3D *v3d, ARegion *ar)
{
- RegionView3D *rv3d= ar->regiondata;
+ RegionView3D *rv3d = ar->regiondata;
if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
@@ -79,15 +79,15 @@
}
/* Draw the given motion path for an Object or a Bone
- * - assumes that the viewport has already been initialized properly
+ * - assumes that the viewport has already been initialized properly
* i.e. draw_motion_paths_init() has been called
*/
void draw_motion_path_instance(Scene *scene,
- Object *ob, bPoseChannel *pchan, bAnimVizSettings *avs, bMotionPath *mpath)
+ Object *ob, bPoseChannel *pchan, bAnimVizSettings *avs, bMotionPath *mpath)
{
//RegionView3D *rv3d= ar->regiondata;
bMotionPathVert *mpv, *mpv_start;
- int i, stepsize= avs->path_step;
+ int i, stepsize = avs->path_step;
int sfra, efra, len;
@@ -99,21 +99,21 @@
* the current frame to draw. However, this range is still
* restricted by the limits of the original path.
*/
- sfra= CFRA - avs->path_bc;
- efra= CFRA + avs->path_ac;
- if (sfra < mpath->start_frame) sfra= mpath->start_frame;
- if (efra > mpath->end_frame) efra= mpath->end_frame;
+ sfra = CFRA - avs->path_bc;
+ efra = CFRA + avs->path_ac;
+ if (sfra < mpath->start_frame) sfra = mpath->start_frame;
+ if (efra > mpath->end_frame) efra = mpath->end_frame;
- len= efra - sfra;
+ len = efra - sfra;
- sind= sfra - mpath->start_frame;
- mpv_start= (mpath->points + sind);
+ sind = sfra - mpath->start_frame;
+ mpv_start = (mpath->points + sind);
}
else {
- sfra= mpath->start_frame;
+ sfra = mpath->start_frame;
efra = sfra + mpath->length;
len = mpath->length;
- mpv_start= mpath->points;
+ mpv_start = mpath->points;
}
if (len <= 0) {
@@ -124,17 +124,17 @@
glShadeModel(GL_SMOOTH);
glBegin(GL_LINE_STRIP);
- for (i=0, mpv=mpv_start; i < len; i++, mpv++) {
- short sel= (pchan) ? (pchan->bone->flag & BONE_SELECTED) : (ob->flag & SELECT);
+ for (i = 0, mpv = mpv_start; i < len; i++, mpv++) {
+ short sel = (pchan) ? (pchan->bone->flag & BONE_SELECTED) : (ob->flag & SELECT);
float intensity; /* how faint */
/* set color
- * - more intense for active/selected bones, less intense for unselected bones
- * - black for before current frame, green for current frame, blue for after current frame
- * - intensity decreases as distance from current frame increases
+ * - more intense for active/selected bones, less intense for unselected bones
+ * - black for before current frame, green for current frame, blue for after current frame
+ * - intensity decreases as distance from current frame increases
*/
- #define SET_INTENSITY(A, B, C, min, max) (((1.0f - ((C - B) / (C - A))) * (max-min)) + min)
- if ((sfra+i) < CFRA) {
+ #define SET_INTENSITY(A, B, C, min, max) (((1.0f - ((C - B) / (C - A))) * (max - min)) + min)
+ if ((sfra + i) < CFRA) {
/* black - before cfra */
if (sel) {
// intensity= 0.5f;
@@ -146,7 +146,7 @@
}
UI_ThemeColorBlend(TH_WIRE, TH_BACK, intensity);
}
- else if ((sfra+i) > CFRA) {
+ else if ((sfra + i) > CFRA) {
/* blue - after cfra */
if (sel) {
//intensity = 0.5f;
@@ -161,10 +161,10 @@
else {
/* green - on cfra */
if (sel) {
- intensity= 0.5f;
+ intensity = 0.5f;
}
else {
- intensity= 0.99f;
+ intensity = 0.99f;
}
UI_ThemeColorBlendShade(TH_CFRAME, TH_BACK, intensity, 10);
}
@@ -182,28 +182,28 @@
* NOTE: this is not really visible/noticeable
*/
glBegin(GL_POINTS);
- for (i=0, mpv=mpv_start; i < len; i++, mpv++)
+ for (i = 0, mpv = mpv_start; i < len; i++, mpv++)
glVertex3fv(mpv->co);
glEnd();
/* Draw little white dots at each framestep value */
UI_ThemeColor(TH_TEXT_HI);
glBegin(GL_POINTS);
- for (i=0, mpv=mpv_start; i < len; i+=stepsize, mpv+=stepsize)
+ for (i = 0, mpv = mpv_start; i < len; i += stepsize, mpv += stepsize)
glVertex3fv(mpv->co);
glEnd();
/* Draw big green dot where the current frame is */
// NOTE: only do this when drawing keyframes for now...
if ((avs->path_viewflag & MOTIONPATH_VIEW_KFRAS) &&
- (sfra < CFRA) && (CFRA <= efra))
+ (sfra < CFRA) && (CFRA <= efra))
{
UI_ThemeColor(TH_CFRAME);
glPointSize(6.0f);
glBegin(GL_POINTS);
- mpv = mpv_start + (CFRA - sfra);
- glVertex3fv(mpv->co);
+ mpv = mpv_start + (CFRA - sfra);
+ glVertex3fv(mpv->co);
glEnd();
glPointSize(1.0f);
@@ -217,26 +217,26 @@
if (avs->path_viewflag & MOTIONPATH_VIEW_FNUMS) {
unsigned char col[4];
UI_GetThemeColor3ubv(TH_TEXT_HI, col);
- col[3]= 255;
+ col[3] = 255;
- for (i=0, mpv=mpv_start; i < len; i+=stepsize, mpv+=stepsize) {
+ for (i = 0, mpv = mpv_start; i < len; i += stepsize, mpv += stepsize) {
char numstr[32];
float co[3];
/* only draw framenum if several consecutive highlighted points don't occur on same point */
if (i == 0) {
- sprintf(numstr, "%d", (i+sfra));
+ sprintf(numstr, "%d", (i + sfra));
mul_v3_m4v3(co, ob->imat, mpv->co);
- view3d_cached_text_draw_add(co, numstr, 0, V3D_CACHE_TEXT_WORLDSPACE|V3D_CACHE_TEXT_ASCII, col);
+ view3d_cached_text_draw_add(co, numstr, 0, V3D_CACHE_TEXT_WORLDSPACE | V3D_CACHE_TEXT_ASCII, col);
}
- else if ((i > stepsize) && (i < len-stepsize)) {
+ else if ((i > stepsize) && (i < len - stepsize)) {
bMotionPathVert *mpvP = (mpv - stepsize);
bMotionPathVert *mpvN = (mpv + stepsize);
- if ((equals_v3v3(mpv->co, mpvP->co)==0) || (equals_v3v3(mpv->co, mpvN->co)==0)) {
- sprintf(numstr, "%d", (sfra+i));
+ if ((equals_v3v3(mpv->co, mpvP->co) == 0) || (equals_v3v3(mpv->co, mpvN->co) == 0)) {
+ sprintf(numstr, "%d", (sfra + i));
mul_v3_m4v3(co, ob->imat, mpv->co);
- view3d_cached_text_draw_add(co, numstr, 0, V3D_CACHE_TEXT_WORLDSPACE|V3D_CACHE_TEXT_ASCII, col);
+ view3d_cached_text_draw_add(co, numstr, 0, V3D_CACHE_TEXT_WORLDSPACE | V3D_CACHE_TEXT_ASCII, col);
}
}
}
@@ -246,7 +246,7 @@
if (avs->path_viewflag & MOTIONPATH_VIEW_KFRAS) {
unsigned char col[4];
- AnimData *adt= BKE_animdata_from_id(&ob->id);
+ AnimData *adt = BKE_animdata_from_id(&ob->id);
DLRBT_Tree keys;
/* build list of all keyframes in active action for object or pchan */
@@ -256,8 +256,8 @@
/* it is assumed that keyframes for bones are all grouped in a single group
* unless an option is set to always use the whole action
*/
- if ((pchan) && (avs->path_viewflag & MOTIONPATH_VIEW_KFACT)==0) {
- bActionGroup *agrp= action_groups_find_named(adt->action, pchan->name);
+ if ((pchan) && (avs->path_viewflag & MOTIONPATH_VIEW_KFACT) == 0) {
+ bActionGroup *agrp = action_groups_find_named(adt->action, pchan->name);
if (agrp) {
agroup_to_keylist(adt, agrp, &keys, NULL);
@@ -272,14 +272,14 @@
/* Draw slightly-larger yellow dots at each keyframe */
UI_GetThemeColor3ubv(TH_VERTEX_SELECT, col);
- col[3]= 255;
+ col[3] = 255;
glPointSize(4.0f); // XXX perhaps a bit too big
glColor3ubv(col);
glBegin(GL_POINTS);
- for (i=0, mpv=mpv_start; i < len; i++, mpv++) {
- float mframe= (float)(sfra + i);
+ for (i = 0, mpv = mpv_start; i < len; i++, mpv++) {
+ float mframe = (float)(sfra + i);
if (BLI_dlrbTree_search_exact(&keys, compare_ak_cfraPtr, &mframe))
glVertex3fv(mpv->co);
@@ -291,15 +291,15 @@
/* Draw frame numbers of keyframes */
if (avs->path_viewflag & MOTIONPATH_VIEW_KFNOS) {
float co[3];
- for (i=0, mpv=mpv_start; i < len; i++, mpv++) {
- float mframe= (float)(sfra + i);
+ for (i = 0, mpv = mpv_start; i < len; i++, mpv++) {
+ float mframe = (float)(sfra + i);
if (BLI_dlrbTree_search_exact(&keys, compare_ak_cfraPtr, &mframe)) {
char numstr[32];
- sprintf(numstr, "%d", (sfra+i));
+ sprintf(numstr, "%d", (sfra + i));
mul_v3_m4v3(co, ob->imat, mpv->co);
- view3d_cached_text_draw_add(co, numstr, 0, V3D_CACHE_TEXT_WORLDSPACE|V3D_CACHE_TEXT_ASCII, col);
+ view3d_cached_text_draw_add(co, numstr, 0, V3D_CACHE_TEXT_WORLDSPACE | V3D_CACHE_TEXT_ASCII, col);
}
}
}
Modified: trunk/blender/source/blender/editors/space_view3d/drawarmature.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawarmature.c 2012-03-25 23:19:21 UTC (rev 45147)
+++ trunk/blender/source/blender/editors/space_view3d/drawarmature.c 2012-03-25 23:54:33 UTC (rev 45148)
@@ -72,30 +72,30 @@
/* *************** Armature Drawing - Coloring API ***************************** */
/* global here is reset before drawing each bone */
-static ThemeWireColor *bcolor= NULL;
+static ThemeWireColor *bcolor = NULL;
/* values of colCode for set_pchan_glcolor */
enum {
- PCHAN_COLOR_NORMAL = 0, /* normal drawing */
- PCHAN_COLOR_SOLID, /* specific case where "solid" color is needed */
- PCHAN_COLOR_CONSTS, /* "constraint" colors (which may/may-not be suppressed) */
-
- PCHAN_COLOR_SPHEREBONE_BASE, /* for the 'stick' of sphere (envelope) bones */
- PCHAN_COLOR_SPHEREBONE_END, /* for the ends of sphere (envelope) bones */
- PCHAN_COLOR_LINEBONE /* for the middle of line-bones */
+ PCHAN_COLOR_NORMAL = 0, /* normal drawing */
+ PCHAN_COLOR_SOLID, /* specific case where "solid" color is needed */
+ PCHAN_COLOR_CONSTS, /* "constraint" colors (which may/may-not be suppressed) */
+
+ PCHAN_COLOR_SPHEREBONE_BASE, /* for the 'stick' of sphere (envelope) bones */
+ PCHAN_COLOR_SPHEREBONE_END, /* for the ends of sphere (envelope) bones */
+ PCHAN_COLOR_LINEBONE /* for the middle of line-bones */
};
/* This function sets the color-set for coloring a certain bone */
-static void set_pchan_colorset (Object *ob, bPoseChannel *pchan)
+static void set_pchan_colorset(Object *ob, bPoseChannel *pchan)
{
- bPose *pose= (ob) ? ob->pose : NULL;
- bArmature *arm= (ob) ? ob->data : NULL;
- bActionGroup *grp= NULL;
- short color_index= 0;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list