[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56897] trunk/blender/source/blender/ editors: style cleanup

Campbell Barton ideasman42 at gmail.com
Sat May 18 13:37:49 CEST 2013


Revision: 56897
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56897
Author:   campbellbarton
Date:     2013-05-18 11:37:49 +0000 (Sat, 18 May 2013)
Log Message:
-----------
style cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_draw.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c

Modified: trunk/blender/source/blender/editors/animation/anim_draw.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_draw.c	2013-05-18 11:25:24 UTC (rev 56896)
+++ trunk/blender/source/blender/editors/animation/anim_draw.c	2013-05-18 11:37:49 UTC (rev 56897)
@@ -262,9 +262,9 @@
 		glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
 		
 		/* only draw two separate 'curtains' if there's no overlap between them */
-		if (PSFRA < PEFRA+end_frame_width) {
+		if (PSFRA < PEFRA + end_frame_width) {
 			glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
-			glRectf((float)(PEFRA+end_frame_width), v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+			glRectf((float)(PEFRA + end_frame_width), v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
 		}
 		else {
 			glRectf(v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c	2013-05-18 11:25:24 UTC (rev 56896)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c	2013-05-18 11:37:49 UTC (rev 56897)
@@ -389,17 +389,17 @@
 		 * are aligned nicely with no overlap. for this the spacing needs to be
 		 * the average of the previous and next size. */
 		float s = paint_space_stroke_spacing(scene, stroke, 1.0f, pressure);
-		float q = s*dpressure/(2.0f*length);
-		float pressure_fac = (1.0f + q)/(1.0f - q);
+		float q = s * dpressure / (2.0f * length);
+		float pressure_fac = (1.0f + q) / (1.0f - q);
 
 		float last_size_pressure = stroke->last_pressure;
-		float new_size_pressure = stroke->last_pressure*pressure_fac;
+		float new_size_pressure = stroke->last_pressure * pressure_fac;
 
 		/* average spacing */
 		float last_spacing = paint_space_stroke_spacing(scene, stroke, last_size_pressure, pressure);
 		float new_spacing = paint_space_stroke_spacing(scene, stroke, new_size_pressure, pressure);
 
-		return 0.5f*(last_spacing + new_spacing);
+		return 0.5f * (last_spacing + new_spacing);
 	}
 	else {
 		/* no size pressure */
@@ -432,9 +432,9 @@
 			float spacing = paint_space_stroke_spacing_variable(scene, stroke, pressure, dpressure, length);
 			
 			if (length >= spacing) {
-				mouse[0] = stroke->last_mouse_position[0] + dmouse[0]*spacing;
-				mouse[1] = stroke->last_mouse_position[1] + dmouse[1]*spacing;
-				pressure = stroke->last_pressure + (spacing/length)*dpressure;
+				mouse[0] = stroke->last_mouse_position[0] + dmouse[0] * spacing;
+				mouse[1] = stroke->last_mouse_position[1] + dmouse[1] * spacing;
+				pressure = stroke->last_pressure + (spacing / length) * dpressure;
 
 				paint_brush_stroke_add_step(C, op, mouse, pressure);
 

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2013-05-18 11:25:24 UTC (rev 56896)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2013-05-18 11:37:49 UTC (rev 56897)
@@ -1381,7 +1381,7 @@
 	 * frame range used is preview range or scene range */
 	UI_ThemeColorShadeAlpha(TH_BACK, -25, -100);
 
-	if (PSFRA < PEFRA+1) {
+	if (PSFRA < PEFRA + 1) {
 		glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
 		glRectf((float)(PEFRA + 1), v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
 	}




More information about the Bf-blender-cvs mailing list