[Bf-blender-cvs] [8d122d6] soc-2013-paint: Merge branch 'master' into soc-2013-paint

[Antony Riakiotakis]

Commit: 8d122d68c941cd45b9f98fb4e20891b263b31632
Author: Antony Riakiotakis
Date:   Tue Mar 11 21:13:35 2014 +0200
https://developer.blender.org/rB8d122d68c941cd45b9f98fb4e20891b263b31632

Merge branch 'master' into soc-2013-paint

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



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

diff --cc source/blender/editors/sculpt_paint/sculpt.c
index 89ac217,eac1853..a94cfda
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -5085,11 -5139,11 +5091,12 @@@ static int sculpt_mode_toggle_exec(bCon
  			ts->sculpt = MEM_callocN(sizeof(Sculpt), "sculpt mode data");
  
  			/* Turn on X plane mirror symmetry by default */
 +
  			ts->sculpt->paint.symmetry_flags |= PAINT_SYMM_X;
+ 			ts->sculpt->paint.flags |= PAINT_SHOW_BRUSH;
  
  			/* Make sure at least dyntopo subdivision is enabled */
 -			ts->sculpt->flags |= SCULPT_DYNTOPO_SUBDIVIDE;
 +			ts->sculpt->paint.symmetry_flags |= SCULPT_DYNTOPO_SUBDIVIDE;
  		}
  
  		if (!ts->sculpt->detail_size)