[Bf-blender-cvs] [3aaca08] strand_editmode: Merge branch 'master' into strand_editmode

[Lukas Tönne]

Commit: 3aaca08aad70d1aedca669d9f84de75d4dd7abd3
Author: Lukas Tönne
Date:   Sat Sep 19 16:29:04 2015 +0200
Branches: strand_editmode
https://developer.blender.org/rB3aaca08aad70d1aedca669d9f84de75d4dd7abd3

Merge branch 'master' into strand_editmode

Conflicts:
	source/blender/editors/sculpt_paint/paint_ops.c

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



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

diff --cc source/blender/blenkernel/intern/customdata.c
index 0c57cdc,ecd8093..dac5ccd
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@@ -1369,19 -1364,8 +1367,19 @@@ const CustomDataMask CD_MASK_BMESH 
  const CustomDataMask CD_MASK_FACECORNERS =  /* XXX Not used anywhere! */
      CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_MTEXPOLY | CD_MASK_MLOOPUV |
      CD_MASK_MLOOPCOL | CD_MASK_NORMAL | CD_MASK_MLOOPTANGENT;
 +const CustomDataMask CD_MASK_STRANDS =
 +    CD_MASK_MVERT | CD_MASK_MEDGE |
-     CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MCOL |
++    CD_MASK_MDEFORMVERT | CD_MASK_MCOL |
 +    CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS |
 +    CD_MASK_MVERT_SKIN | CD_MASK_FREESTYLE_EDGE |
 +    CD_MASK_MSURFACE_SAMPLE;
 +const CustomDataMask CD_MASK_STRANDS_BMESH =
-     CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_PROP_FLT | CD_MASK_PROP_INT |
++    CD_MASK_MDEFORMVERT | CD_MASK_PROP_FLT | CD_MASK_PROP_INT |
 +    CD_MASK_PROP_STR | CD_MASK_SHAPEKEY | CD_MASK_SHAPE_KEYINDEX | CD_MASK_MDISPS |
 +    CD_MASK_MVERT_SKIN | CD_MASK_FREESTYLE_EDGE |
 +    CD_MASK_MSURFACE_SAMPLE;
  const CustomDataMask CD_MASK_EVERYTHING =
-     CD_MASK_MVERT | CD_MASK_MSTICKY /* DEPRECATED */ | CD_MASK_MDEFORMVERT | CD_MASK_MEDGE | CD_MASK_MFACE |
+     CD_MASK_MVERT | CD_MASK_MDEFORMVERT | CD_MASK_MEDGE | CD_MASK_MFACE |
      CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_ORIGINDEX | CD_MASK_NORMAL /* | CD_MASK_POLYINDEX */ | CD_MASK_PROP_FLT |
      CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_ORIGSPACE | CD_MASK_ORCO | CD_MASK_MTEXPOLY | CD_MASK_MLOOPUV |
      CD_MASK_MLOOPCOL | CD_MASK_TANGENT | CD_MASK_MDISPS | CD_MASK_PREVIEW_MCOL | CD_MASK_CLOTH_ORCO | CD_MASK_RECAST |
diff --cc source/blender/editors/sculpt_paint/paint_ops.c
index b95951a,05eda4d..f12842d
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@@ -65,35 -63,17 +65,36 @@@
  static int brush_add_exec(bContext *C, wmOperator *UNUSED(op))
  {
  	/*int type = RNA_enum_get(op->ptr, "type");*/
 -	Paint *paint = BKE_paint_get_active_from_context(C);
 -	Brush *br = BKE_paint_brush(paint);
  	Main *bmain = CTX_data_main(C);
+ 	PaintMode mode = BKE_paintmode_get_active_from_context(C);
 -
 +	Scene *scene = CTX_data_scene(C);
 +	Object *ob = CTX_data_active_object(C);
 +	Paint *paint = NULL;
 +	HairEditSettings *hair_edit = NULL;
 +	Brush *br = NULL;
 +	
 +	/* get active brush context */
 +	if (ob->mode == OB_MODE_HAIR_EDIT) {
 +		hair_edit = &scene->toolsettings->hair_edit;
 +		br = hair_edit->brush;
 +	}
 +	else {
 +		paint = BKE_paint_get_active_from_context(C);
 +		br = BKE_paint_brush(paint);
 +	}
 +	
  	if (br)
  		br = BKE_brush_copy(br);
  	else
- 		br = BKE_brush_add(bmain, "Brush");
+ 		br = BKE_brush_add(bmain, "Brush", BKE_paint_object_mode_from_paint_mode(mode));
  
 -	BKE_paint_brush_set(paint, br);
 +	/* set new brush pointer in the context */
 +	if (ob->mode == OB_MODE_HAIR_EDIT) {
 +		hair_edit->brush = br;
 +	}
 +	else {
 +		BKE_paint_brush_set(paint, br);
 +	}
  
  	return OPERATOR_FINISHED;
  }