[Bf-blender-cvs] [9a3b424] soc-2013-paint: Merge branch 'master' into soc-2013-paint

[Antony Riakiotakis]

Commit: 9a3b424ae115ccfe481d820f08e51f07b5cc5a06
Author: Antony Riakiotakis
Date:   Fri Mar 7 14:28:46 2014 +0200
https://developer.blender.org/rB9a3b424ae115ccfe481d820f08e51f07b5cc5a06

Merge branch 'master' into soc-2013-paint

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



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

diff --cc source/blender/editors/sculpt_paint/sculpt.c
index 902d81d,df1b14a..89ac217
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -4426,16 -4485,21 +4436,21 @@@ static void sculpt_stroke_update_step(b
  	sculpt_update_cache_variants(C, sd, ob, itemptr);
  	sculpt_restore_mesh(sd, ob);
  
- 	BKE_pbvh_bmesh_detail_size_set(ss->pbvh,
- 	                               (ss->cache->radius /
- 	                                (float)ups->pixel_radius) *
- 	                               (float)sd->detail_size);
+ 	if (sd->flags & SCULPT_DYNTOPO_DETAIL_CONSTANT) {
+ 		BKE_pbvh_bmesh_detail_size_set(ss->pbvh, (float)sd->detail_size / 100.0f);
+ 	}
+ 	else {
+ 		BKE_pbvh_bmesh_detail_size_set(ss->pbvh,
+ 		                               (ss->cache->radius /
+ 		                                (float)ups->pixel_radius) *
+ 		                               (float)sd->detail_size);
+ 	}
  
  	if (sculpt_stroke_dynamic_topology(ss, brush)) {
 -		do_symmetrical_brush_actions(sd, ob, sculpt_topology_update);
 +		do_symmetrical_brush_actions(sd, ob, sculpt_topology_update, ups);
  	}
  
 -	do_symmetrical_brush_actions(sd, ob, do_brush_action);
 +	do_symmetrical_brush_actions(sd, ob, do_brush_action, ups);
  
  	sculpt_combine_proxies(sd, ob);