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.

1 files changed, 13 insertions, 0 deletions

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