Image Paint:

- Code for brush spacing and timing was rewritten, making spacing more even.
  Example: http://users.pandora.be/blendix/brush_spacing.jpg
- Instead of Stepsize for regular brushes and Flow for airbrushes, there is
  now Spacing for both, and Rate for airbrushes.
- Airbrush now works more like it does in the Gimp now, by maintaining the
  spacing even if the brush moves faster than the painting rate.

- Some preparations to make brushes work in texture paint mode.

1 files changed, 11 insertions, 9 deletions

diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index ff578494339..8372e004fcb 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -35,23 +35,25 @@
 typedef struct Brush {
 	ID id;
 	
-	short flag, blend;
-	int size;
-	float innerradius;
-	float timing;
+	short flag, blend;			/* general purpose flag, blend mode */
+	int size;					/* brush diameter */
+	float innerradius;			/* inner radius after which the falloff starts */
+	float spacing;				/* spacing of paint operations */
+	float rate;					/* paint operations / second (airbrush) */
 
-	float rgb[3];					/* color */
-	float alpha;					/* opacity */
+	float rgb[3];				/* color */
+	float alpha;				/* opacity */
 
 	struct Clone {
-		struct Image *image;		/* image for clone tool */
-		float offset[2];			/* offset of clone image from canvas */
-		float alpha;				/* transparency for drawing of clone image */
+		struct Image *image;	/* image for clone tool */
+		float offset[2];		/* offset of clone image from canvas */
+		float alpha;			/* transparency for drawing of clone image */
 	} clone;
 } Brush;
 
 /* Brush.flag */
 #define BRUSH_AIRBRUSH	1
+#define BRUSH_TORUS		2
 
 /* Brush.blend */
 #define BRUSH_BLEND_MIX 	0