[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56363] trunk/blender/source/blender: warning cleanup: assignment to unused vars, r56359 changes how brush falloff is used slightly but this isn' t so important so just remove falloff adjustment.

[Campbell Barton]

Revision: 56363
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56363
Author:   campbellbarton
Date:     2013-04-28 15:37:18 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
warning cleanup: assignment to unused vars, r56359 changes how brush falloff is used slightly but this isn't so important so just remove falloff adjustment.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56359

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/seqeffects.c
    trunk/blender/source/blender/blenlib/intern/math_color_blend_inline.c
    trunk/blender/source/blender/editors/render/render_preview.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
    trunk/blender/source/blender/editors/space_outliner/outliner_tree.c

Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c	2013-04-28 15:20:52 UTC (rev 56362)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c	2013-04-28 15:37:18 UTC (rev 56363)
@@ -974,10 +974,10 @@
 	}
 }
 
-static void do_sub_effect_float(float facf0, float facf1, int x, int y, float *rect1, float *rect2, float *out)
+static void do_sub_effect_float(float UNUSED(facf0), float facf1, int x, int y, float *rect1, float *rect2, float *out)
 {
 	int xo;
-	float m, fac1, fac3;
+	float m /*, fac1*/, fac3;
 	float *rt1, *rt2, *rt;
 
 	xo = x;
@@ -985,7 +985,8 @@
 	rt2 = rect2;
 	rt = out;
 
-	fac1 = facf0;
+	/* UNUSED */
+	// fac1 = facf0;
 	fac3 = facf1;
 
 	while (y--) {

Modified: trunk/blender/source/blender/blenlib/intern/math_color_blend_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_color_blend_inline.c	2013-04-28 15:20:52 UTC (rev 56362)
+++ trunk/blender/source/blender/blenlib/intern/math_color_blend_inline.c	2013-04-28 15:37:18 UTC (rev 56363)
@@ -352,7 +352,7 @@
 		 * src1 and src2, then blend it with src1 */
 		const float t = src2[3];
 		const float mt = 1.0f - t;
-		const float map_alpha = src1[3]/src2[3];
+		const float map_alpha = src1[3] / src2[3];
 
 		dst[0] = mt * src1[0] + t * min_ff(src1[0], src2[0] * map_alpha);
 		dst[1] = mt * src1[1] + t * min_ff(src1[1], src2[1] * map_alpha);

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2013-04-28 15:20:52 UTC (rev 56362)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2013-04-28 15:37:18 UTC (rev 56363)
@@ -610,7 +610,8 @@
 		/* start a new preview render job if signalled through sbuts->preview,
 		 * or if no render result was found and no preview render job is running */
 		if ((sbuts->spacetype == SPACE_BUTS && sbuts->preview) ||
-			(!ok && !WM_jobs_test(wm, sa, WM_JOB_TYPE_RENDER_PREVIEW))) {
+		    (!ok && !WM_jobs_test(wm, sa, WM_JOB_TYPE_RENDER_PREVIEW)))
+		{
 			sbuts->preview = 0;
 			ED_preview_shader_job(C, sa, id, parent, slot, newx, newy, PR_BUTS_RENDER);
 		}

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c	2013-04-28 15:20:52 UTC (rev 56362)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c	2013-04-28 15:37:18 UTC (rev 56363)
@@ -3822,7 +3822,7 @@
 						float mask = ((float)projPixel->mask) * (1.0f / 65535.0f);
 
 						straight_uchar_to_premul_float(newColor_f, projPixel->newColor.ch);
-    					mul_v4_v4fl(newColor_f, newColor_f, mask);
+						mul_v4_v4fl(newColor_f, newColor_f, mask);
 
 						blend_color_mix_float(projPixel->pixel.f_pt,  projPixel->origColor.f,
 						                      newColor_f);
@@ -3893,10 +3893,6 @@
 							mask *= ((float)projPixel->mask) * (1.0f / 65535.0f);
 						}
 						else {
-							/* This brush dosnt accumulate so add some curve to the brushes falloff */
-							falloff = 1.0f - falloff;
-							falloff = 1.0f - (falloff * falloff);
-
 							mask_short = (unsigned short)(projPixel->mask * mask);
 
 							if (mask_short > projPixel->mask_max) {

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_tree.c	2013-04-28 15:20:52 UTC (rev 56362)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tree.c	2013-04-28 15:37:18 UTC (rev 56363)
@@ -403,11 +403,11 @@
 
 #undef LOG2I
 
-static int outliner_animdata_test(AnimData *adt)
+static bool outliner_animdata_test(AnimData *adt)
 {
 	if (adt)
 		return (adt->action || adt->drivers.first || adt->nla_tracks.first);
-	return 0;
+	return false;
 }
 
 static void outliner_add_scene_contents(SpaceOops *soops, ListBase *lb, Scene *sce, TreeElement *te)