GSOC 2013 paint

Yep, at last it's here!

There are a few minor issues remaining but development can go on in
master after discussion at blender institute.

For full list of features see:

http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting

Thanks to Sergey and Campbell for the extensive review and to the
countless artists that have given their input and reported issues during
development.

1 files changed, 27 insertions, 6 deletions

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index c4c1736c058..5e27fffcc97 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -811,7 +811,8 @@ typedef struct TimeMarker {
 /* Paint Tool Base */
 typedef struct Paint {
 	struct Brush *brush;
-	
+	struct Palette *palette;
+
 	/* WM Paint cursor */
 	void *paint_cursor;
 	unsigned char paint_cursor_col[4];
@@ -840,9 +841,17 @@ typedef struct ImagePaintSettings {
 	short seam_bleed, normal_angle;
 	short screen_grab_size[2]; /* capture size for re-projection */
 
+	/* new layer default resolution */
+	int slot_xresolution_default;
+	int slot_yresolution_default;
+
 	int pad1;
 
 	void *paintcursor;			/* wm handle */
+	struct Image *stencil;      /* workaround until we support true layer masks */
+	float slot_color_default[4];
+	float stencil_col[3];
+	float pad2;
 } ImagePaintSettings;
 
 /* ------------------------------------------- */
@@ -966,6 +975,11 @@ typedef struct UnifiedPaintSettings {
 	/* unified brush weight, [0, 1] */
 	float weight;
 
+	/* unified brush color */
+	float rgb[3];
+	/* unified brush secondary color */
+	float secondary_rgb[3];
+
 	/* user preferences for sculpt and paint */
 	int flag;
 
@@ -973,7 +987,6 @@ typedef struct UnifiedPaintSettings {
 
 	/* record movement of mouse so that rake can start at an intuitive angle */
 	float last_rake[2];
-	int pad;
 
 	float brush_rotation;
 
@@ -981,7 +994,14 @@ typedef struct UnifiedPaintSettings {
 	 *  all data below are used to communicate with cursor drawing and tex sampling  *
 	 *********************************************************************************/
 	int draw_anchored;
-	int   anchored_size;
+	int anchored_size;
+
+	char draw_inverted;
+	char pad3[7];
+
+	float overlap_factor; /* normalization factor due to accumulated value of curve along spacing.
+	                       * Calculated when brush spacing changes to dampen strength of stroke
+	                       * if space attenuation is used*/
 	float anchored_initial_mouse[2];
 
 	/* check is there an ongoing stroke right now */
@@ -1001,15 +1021,16 @@ typedef struct UnifiedPaintSettings {
 	struct ColorSpace *colorspace;
 
 	/* radius of brush, premultiplied with pressure.
-	 * In case of anchored brushes contains that radius */
+	 * In case of anchored brushes contains the anchored radius */
 	float pixel_radius;
-	int pad2;
+	int pad4;
 } UnifiedPaintSettings;
 
 typedef enum {
 	UNIFIED_PAINT_SIZE  = (1 << 0),
 	UNIFIED_PAINT_ALPHA = (1 << 1),
 	UNIFIED_PAINT_WEIGHT = (1 << 5),
+	UNIFIED_PAINT_COLOR = (1 << 6),
 
 	/* only used if unified size is enabled, mirrors the brush flags
 	 * BRUSH_LOCK_SIZE and BRUSH_SIZE_PRESSURE */
@@ -1647,7 +1668,7 @@ enum {
 typedef enum {
 	PAINT_SHOW_BRUSH = (1 << 0),
 	PAINT_FAST_NAVIGATE = (1 << 1),
-	PAINT_SHOW_BRUSH_ON_SURFACE = (1 << 2),
+	PAINT_SHOW_BRUSH_ON_SURFACE = (1 << 2)
 } PaintFlags;
 
 /* Paint.symmetry_flags