ImagePaint Refactoring:

- ImagePaint now uses ImBuf directly, and the rect blending functions
  were moved into the imbuf module.
- The brush spacing, timing and sampling was abstracted into brush.c, for
  later reuse in other paint modes.

Float ImagePaint support.

Textured Brushes:
- Only the first texture channel is used now.
- Options for size and offset should be added, but need to find some space
  in the panel, or add a second one ..

1 files changed, 10 insertions, 0 deletions

diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 8372e004fcb..1d620de8979 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -32,6 +32,13 @@
 
 #include "DNA_ID.h"
 
+#ifndef MAX_MTEX
+#define MAX_MTEX	10
+#endif
+
+struct MTex;
+struct Image;
+
 typedef struct Brush {
 	ID id;
 	
@@ -44,6 +51,9 @@ typedef struct Brush {
 	float rgb[3];				/* color */
 	float alpha;				/* opacity */
 
+	short texact, pad;
+	struct MTex *mtex[10];
+
 	struct Clone {
 		struct Image *image;	/* image for clone tool */
 		float offset[2];		/* offset of clone image from canvas */