[Bf-blender-cvs] [5b6130e] soc-2013-paint: Merge branch 'master' into soc-2013-paint

[Antony Riakiotakis]

Commit: 5b6130e98eb90290c6ebaee869be8d178ab062a7
Author: Antony Riakiotakis
Date:   Thu Mar 27 00:13:51 2014 +0200
https://developer.blender.org/rB5b6130e98eb90290c6ebaee869be8d178ab062a7

Merge branch 'master' into soc-2013-paint

Also includes follow up to fix for T39412

Conflicts:
	release/scripts/startup/bl_ui/space_view3d_toolbar.py
	source/blender/makesrna/intern/rna_brush.c

===================================================================



===================================================================

diff --cc source/blender/makesrna/intern/rna_brush.c
index 664c89a,67cea35..41b73e8
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@@ -49,6 -49,13 +49,16 @@@ static EnumPropertyItem prop_direction_
  	{0, NULL, 0, NULL, NULL}
  };
  
+ static EnumPropertyItem brush_stroke_method_items[] = {
+ 	{0, "DOTS", 0, "Dots", "Apply paint on each mouse move step"},
+ 	{BRUSH_SPACE, "SPACE", 0, "Space", "Limit brush application to the distance specified by spacing"},
+ 	{BRUSH_AIRBRUSH, "AIRBRUSH", 0, "Airbrush", "Keep applying paint effect while holding mouse (spray)"},
++	{BRUSH_LINE, "LINE", 0, "Line", "Draw a line with dabs separated according to spacing"},
++	{BRUSH_POLYLINE, "POLYLINE", 0, "Polyline", "Draw a series of lines with dabs separated according to spacing"},
++	{BRUSH_CURVE, "CURVE", 0, "Curve", "Define the stroke curve with a bezier curve. Dabs are separated according to spacing"},
+ 	{0, NULL, 0, NULL, NULL}
+ };
+ 
  EnumPropertyItem brush_sculpt_tool_items[] = {
  	{SCULPT_TOOL_BLOB, "BLOB", ICON_BRUSH_BLOB, "Blob", ""},
  	{SCULPT_TOOL_CLAY, "CLAY", ICON_BRUSH_CLAY, "Clay", ""},
@@@ -553,6 -472,28 +563,33 @@@ static EnumPropertyItem *rna_Brush_dire
  	}
  }
  
+ static EnumPropertyItem *rna_Brush_stroke_itemf(bContext *C, PointerRNA *UNUSED(ptr),
+ 												   PropertyRNA *UNUSED(prop), bool *UNUSED(r_free))
+ {
+ 	static EnumPropertyItem sculpt_stroke_method_items[] = {
+ 		{0, "DOTS", 0, "Dots", "Apply paint on each mouse move step"},
+ 		{BRUSH_DRAG_DOT, "DRAG_DOT", 0, "Drag Dot", "Allows a single dot to be carefully positioned"},
+ 		{BRUSH_SPACE, "SPACE", 0, "Space", "Limit brush application to the distance specified by spacing"},
+ 		{BRUSH_ANCHORED, "ANCHORED", 0, "Anchored", "Keep the brush anchored to the initial location"},
+ 		{BRUSH_AIRBRUSH, "AIRBRUSH", 0, "Airbrush", "Keep applying paint effect while holding mouse (spray)"},
++		{BRUSH_LINE, "LINE", 0, "Line", "Drag a line with dabs separated according to spacing"},
++		{BRUSH_POLYLINE, "POLYLINE", 0, "Polyline", "Draw a series of lines with dabs separated according to spacing"},
++		{BRUSH_CURVE, "CURVE", 0, "Curve", "Define the stroke curve with a bezier curve. Dabs are separated according to spacing"},
+ 		{0, NULL, 0, NULL, NULL}
+ 	};
+ 
+ 	PaintMode mode = BKE_paintmode_get_active_from_context(C);
+ 
+ 	switch(mode) {
+ 		case PAINT_SCULPT:
++		case PAINT_TEXTURE_2D:
++		case PAINT_TEXTURE_PROJECTIVE:
+ 			return sculpt_stroke_method_items;
+ 
+ 		default:
+ 			return brush_stroke_method_items;
+ 	}
+ }
  #else
  
  static void rna_def_brush_texture_slot(BlenderRNA *brna)
@@@ -727,47 -639,9 +764,25 @@@ static void rna_def_brush(BlenderRNA *b
  		{IMB_BLEND_DARKEN, "DARKEN", 0, "Darken", "Use darken blending mode while painting"},
  		{IMB_BLEND_ERASE_ALPHA, "ERASE_ALPHA", 0, "Erase Alpha", "Erase alpha while painting"},
  		{IMB_BLEND_ADD_ALPHA, "ADD_ALPHA", 0, "Add Alpha", "Add alpha while painting"},
 +		{IMB_BLEND_OVERLAY, "OVERLAY", 0, "Overlay", "Use overlay blending mode while painting"},
 +		{IMB_BLEND_HARDLIGHT, "HARDLIGHT", 0, "Hard light", "Use hard light blending mode while painting"},
 +		{IMB_BLEND_COLORBURN, "COLORBURN", 0, "Color burn", "Use color burn blending mode while painting"},
 +		{IMB_BLEND_LINEARBURN, "LINEARBURN", 0, "Linear burn", "Use linear burn blending mode while painting"},
 +		{IMB_BLEND_COLORDODGE, "COLORDODGE", 0, "Color dodge", "Use color dodge blending mode while painting"},
 +		{IMB_BLEND_SCREEN, "SCREEN", 0, "Screen", "Use screen blending mode while painting"},
 +		{IMB_BLEND_SOFTLIGHT, "SOFTLIGHT", 0, "Soft light", "Use softlight blending mode while painting"},
 +		{IMB_BLEND_PINLIGHT, "PINLIGHT", 0, "Pin light", "Use pinlight blending mode while painting"},
 +		{IMB_BLEND_VIVIDLIGHT, "VIVIDLIGHT", 0, "Vivid light", "Use vividlight blending mode while painting"},
 +		{IMB_BLEND_LINEARLIGHT, "LINEARLIGHT", 0, "Linear light", "Use linearlight blending mode while painting"},
 +		{IMB_BLEND_DIFFERENCE, "DIFFERENCE", 0, "Difference", "Use difference blending mode while painting"},
 +		{IMB_BLEND_EXCLUSION, "EXCLUSION", 0, "Exclusion", "Use exclusion blending mode while painting"},
 +		{IMB_BLEND_HUE, "HUE", 0, "Hue", "Use hue blending mode while painting"},
 +		{IMB_BLEND_SATURATION, "SATURATION", 0, "Saturation", "Use saturation blending mode while painting"},
 +		{IMB_BLEND_LUMINOSITY, "LUMINOSITY", 0, "Luminosity", "Use luminosity blending mode while painting"},
 +		{IMB_BLEND_COLOR, "COLOR", 0, "Color", "Use color blending mode while painting"},
  		{0, NULL, 0, NULL, NULL}
  	};
--	
- 	static EnumPropertyItem sculpt_stroke_method_items[] = {
- 		{0, "DOTS", 0, "Dots", "Apply paint on each mouse move step"},
- 		{BRUSH_DRAG_DOT, "DRAG_DOT", 0, "Drag Dot", "Allows a single dot to be carefully positioned"},
- 		{BRUSH_SPACE, "SPACE", 0, "Space", "Limit brush application to the distance specified by spacing"},
- 		{BRUSH_ANCHORED, "ANCHORED", 0, "Anchored", "Keep the brush anchored to the initial location"},
- 		{BRUSH_AIRBRUSH, "AIRBRUSH", 0, "Airbrush", "Keep applying paint effect while holding mouse (spray)"},
- 		{BRUSH_LINE, "LINE", 0, "Line", "Drag a line with dabs separated according to spacing"},
- 		{BRUSH_POLYLINE, "POLYLINE", 0, "Polyline", "Draw a series of lines with dabs separated according to spacing"},
- 		{BRUSH_CURVE, "CURVE", 0, "Curve", "Define the stroke curve with a bezier curve. Dabs are separated according to spacing"},
- 		{0, NULL, 0, NULL, NULL}
- 	};
- 
- 	static EnumPropertyItem brush_stroke_method_items[] = {
- 		{0, "DOTS", 0, "Dots", "Apply paint on each mouse move step"},
- 		{BRUSH_SPACE, "SPACE", 0, "Space", "Limit brush application to the distance specified by spacing"},
- 		{BRUSH_AIRBRUSH, "AIRBRUSH", 0, "Airbrush", "Keep applying paint effect while holding mouse (spray)"},
- 		{BRUSH_LINE, "LINE", 0, "Line", "Draw a line with dabs separated according to spacing"},
- 		{BRUSH_POLYLINE, "POLYLINE", 0, "Polyline", "Draw a series of lines with dabs separated according to spacing"},
- 		{BRUSH_CURVE, "CURVE", 0, "Curve", "Define the stroke curve with a bezier curve. Dabs are separated according to spacing"},
- 		{0, NULL, 0, NULL, NULL}
- 	};
 +
  	static EnumPropertyItem texture_angle_source_items[] = {
  		{0, "USER", 0, "User", "Rotate the brush texture by given angle"},
  		{BRUSH_RAKE, "RAKE", 0, "Rake", "Rotate the brush texture to match the stroke direction"},