[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29207] branches/soc-2010-jwilkins/source/ blender: Misplaced curly brace.

[Jason Wilkins]

Revision: 29207
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29207
Author:   jwilkins
Date:     2010-06-04 04:34:02 +0200 (Fri, 04 Jun 2010)

Log Message:
-----------
Misplaced curly brace.
Replaced BRUSH_BIT macro because my prefered name BIT was taken.

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h

Modified: branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c	2010-06-04 02:23:06 UTC (rev 29206)
+++ branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c	2010-06-04 02:34:02 UTC (rev 29207)
@@ -10914,7 +10914,6 @@
 		for (brush= main->brush.first; brush; brush= brush->id.next)
 			if(brush->detail == 0.0f)
 				brush->detail = 0.25f;
-	}
 		if (brush->smoothness == 0.0f)
 			brush->smoothness = 0.25f;
 	

Modified: branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h
===================================================================
--- branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h	2010-06-04 02:23:06 UTC (rev 29206)
+++ branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h	2010-06-04 02:34:02 UTC (rev 29207)
@@ -82,27 +82,26 @@
 } Brush;
 
 /* Brush.flag */
-#define BRUSH_BIT(x) (1<<x)
-#define BRUSH_AIRBRUSH		BRUSH_BIT(0)
-#define BRUSH_TORUS		BRUSH_BIT(1)
-#define BRUSH_ALPHA_PRESSURE	BRUSH_BIT(2)
-#define BRUSH_SIZE_PRESSURE	BRUSH_BIT(3)
-#define BRUSH_JITTER_PRESSURE	BRUSH_BIT(4) /* was BRUSH_RAD_PRESSURE */
-#define BRUSH_SPACING_PRESSURE	BRUSH_BIT(5)
-#define BRUSH_FIXED_TEX		BRUSH_BIT(6)
-#define BRUSH_RAKE		BRUSH_BIT(7)
-#define BRUSH_ANCHORED		BRUSH_BIT(8)
-#define BRUSH_DIR_IN		BRUSH_BIT(9)
-#define BRUSH_SPACE		BRUSH_BIT(10)
-#define BRUSH_SMOOTH_STROKE	BRUSH_BIT(11)
-#define BRUSH_PERSISTENT	BRUSH_BIT(12)
-#define BRUSH_ACCUMULATE	BRUSH_BIT(13)
-#define BRUSH_LOCK_ALPHA	BRUSH_BIT(14)
-#define BRUSH_ORIGINAL_NORMAL	BRUSH_BIT(15)
-#define BRUSH_OFFSET_PRESSURE	BRUSH_BIT(16)
-#define BRUSH_SUBDIV		BRUSH_BIT(17)
-#define BRUSH_SPACE_ATTEN	BRUSH_BIT(18)
-#define BRUSH_ADAPTIVE_SPACE	BRUSH_BIT(19)
+#define BRUSH_AIRBRUSH		(1<<0)
+#define BRUSH_TORUS		(1<<1)
+#define BRUSH_ALPHA_PRESSURE	(1<<2)
+#define BRUSH_SIZE_PRESSURE	(1<<3)
+#define BRUSH_JITTER_PRESSURE	(1<<4) /* was BRUSH_RAD_PRESSURE */
+#define BRUSH_SPACING_PRESSURE	(1<<5)
+#define BRUSH_FIXED_TEX		(1<<6)
+#define BRUSH_RAKE		(1<<7)
+#define BRUSH_ANCHORED		(1<<8)
+#define BRUSH_DIR_IN		(1<<9)
+#define BRUSH_SPACE		(1<<10)
+#define BRUSH_SMOOTH_STROKE	(1<<11)
+#define BRUSH_PERSISTENT	(1<<12)
+#define BRUSH_ACCUMULATE	(1<<13)
+#define BRUSH_LOCK_ALPHA	(1<<14)
+#define BRUSH_ORIGINAL_NORMAL	(1<<15)
+#define BRUSH_OFFSET_PRESSURE	(1<<16)
+#define BRUSH_SUBDIV		(1<<17)
+#define BRUSH_SPACE_ATTEN	(1<<18)
+#define BRUSH_ADAPTIVE_SPACE	(1<<19)
 
 
 /* Brush stroke_tool */