[Bf-blender-cvs] [3b16d75] soc-2013-paint: Merge branch 'master' into soc-2013-paint

[Antony Riakiotakis]

Commit: 3b16d75eadbe02f1aa8b0f56553b96b7b7801571
Author: Antony Riakiotakis
Date:   Sat Apr 5 20:33:34 2014 +0300
https://developer.blender.org/rB3b16d75eadbe02f1aa8b0f56553b96b7b7801571

Merge branch 'master' into soc-2013-paint

Conflicts:
	source/blender/makesrna/intern/rna_brush.c

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



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

diff --cc source/blender/makesrna/intern/rna_brush.c
index 14d8a33,9c81d58..1fe6c9e
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@@ -49,13 -49,12 +49,15 @@@ static EnumPropertyItem prop_direction_
  	{0, NULL, 0, NULL, NULL}
  };
  
- static EnumPropertyItem brush_stroke_method_items[] = {
+ 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_AIRBRUSH, "AIRBRUSH", 0, "Airbrush", "Keep applying paint effect while holding mouse (spray)"},
+     {BRUSH_ANCHORED, "ANCHORED", 0, "Anchored", "Keep the brush anchored to the initial location"},
 +	{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}
  };
  
@@@ -566,24 -478,17 +569,22 @@@ 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[] = {
+ 	PaintMode mode = BKE_paintmode_get_active_from_context(C);
+ 
+ 	static EnumPropertyItem brush_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: