Brush Datablock:

- Added a new Brush datablock, only used by image paint, but intended
  to be used in texture paint, vertex paint, weight paint and sculpt
  mode also.
- Being a datablock, these brushes can be saved, appended and linked.
  They have a fake user by default, to make sure they are saved even if
  not selected.

Image Painting:

- Replaced the img module with C code in imagepaint.c
- Airbrush is no longer a separate tool, but rather an option that can
  be used for soften, smear and clone also.
- Blend modes mix, add, subtract, multiply, darken and lighten have been
  added, code taken directly from vertex paint.

Note to project files maintainers:

- The img module was removed from SCons and Makefiles, and this should
  be done in other build systems also. I'll wait to remove the module
  from cvs, to not break compilation.

4 files changed, 86 insertions, 0 deletions

diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 7e71da6df76..f9a824eec27 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -129,6 +129,7 @@ typedef struct Library {
 #define ID_SCRIPT	MAKE_ID2('P', 'Y')
 #define ID_FLUIDSIM	MAKE_ID2('F', 'S')
 #define ID_NT		MAKE_ID2('N', 'T')
+#define ID_BR		MAKE_ID2('B', 'R')
 
 	/* NOTE! Fake IDs, needed for g.sipo->blocktype or outliner */
 #define ID_SEQ		MAKE_ID2('S', 'Q')
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
new file mode 100644
index 00000000000..ff578494339
--- /dev/null
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -0,0 +1,70 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef DNA_BRUSH_TYPES_H
+#define DNA_BRUSH_TYPES_H
+
+#include "DNA_ID.h"
+
+typedef struct Brush {
+	ID id;
+	
+	short flag, blend;
+	int size;
+	float innerradius;
+	float timing;
+
+	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 */
+	} clone;
+} Brush;
+
+/* Brush.flag */
+#define BRUSH_AIRBRUSH	1
+
+/* Brush.blend */
+#define BRUSH_BLEND_MIX 	0
+#define BRUSH_BLEND_ADD 	1
+#define BRUSH_BLEND_SUB 	2
+#define BRUSH_BLEND_MUL 	3
+#define BRUSH_BLEND_LIGHTEN 4
+#define BRUSH_BLEND_DARKEN	5
+
+#define PAINT_TOOL_DRAW		0
+#define PAINT_TOOL_SOFTEN	1
+#define PAINT_TOOL_SMEAR	2
+#define PAINT_TOOL_CLONE	3
+
+#endif
+
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 33edf65454e..fe2b0cfa015 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -344,6 +344,12 @@ typedef struct ToolSettings {
 	/* Select Group Threshold */
 	float select_thresh;
 
+	/* Image Paint */
+	struct ImagePaintSettings {
+		struct Brush *brush;
+		short flag, tool;
+		int pad3;
+	} imapaint;
 } ToolSettings;
 
 typedef struct Scene {
@@ -537,6 +543,13 @@ typedef struct Scene {
 #define FFMPEG_MULTIPLEX_AUDIO  1
 #define FFMPEG_AUTOSPLIT_OUTPUT 2
 
+/* toolsettings->imagepaint_flag */
+#define IMAGEPAINT_TORUS				1
+#define IMAGEPAINT_DRAWING				2
+#define IMAGEPAINT_TIMED				4
+#define IMAGEPAINT_DRAW_TOOL			8
+#define IMAGEPAINT_DRAW_TOOL_DRAWING	16
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 87174abab38..e7abcb1508e 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -125,6 +125,7 @@ char *includefiles[] = {
 	"DNA_nla_types.h",
 	"DNA_node_types.h",
 	"DNA_color_types.h",
+	"DNA_brush_types.h",
 	// if you add files here, please add them at the end
 	// of makesdna.c (this file) as well
 
@@ -1133,4 +1134,5 @@ int main(int argc, char ** argv)
 #include "DNA_nla_types.h"
 #include "DNA_node_types.h"
 #include "DNA_color_types.h"
+#include "DNA_brush_types.h"
 /* end of list */