Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2014-03-04 20:57:30 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-03-04 20:57:45 +0400
commitf53014d642a7ee6599a41b3e4e80f2fe8167ab18 (patch)
tree7fc32f107e03f1ba2f80ba170581c5922169c539
parente0857ad1525ae4644c667adfa0617fc83a095a46 (diff)
Fix simplify brush not supporting autosmooth. There is no reason why
this should be so and it's useful to quickly decimate and smooth at the same time.
-rw-r--r--source/blender/editors/sculpt_paint/sculpt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index d0edecb5489..5d4037a2bd3 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -3915,7 +3915,8 @@ static void sculpt_update_cache_invariants(bContext *C, Sculpt *sd, SculptSessio
mul_m3_v3(mat, viewDir);
normalize_v3_v3(cache->true_view_normal, viewDir);
- cache->supports_gravity = !ELEM(brush->sculpt_tool, SCULPT_TOOL_MASK, SCULPT_TOOL_SMOOTH) && sd->gravity_factor > 0.0f;
+ cache->supports_gravity = !ELEM3(brush->sculpt_tool, SCULPT_TOOL_MASK, SCULPT_TOOL_SMOOTH, SCULPT_TOOL_SIMPLIFY)
+ && sd->gravity_factor > 0.0f;
/* get gravity vector in world space */
if (cache->supports_gravity) {
if (sd->gravity_object) {
@@ -4483,8 +4484,7 @@ static void sculpt_stroke_update_step(bContext *C, struct PaintStroke *UNUSED(st
do_symmetrical_brush_actions(sd, ob, sculpt_topology_update);
}
- if (BKE_paint_brush(&sd->paint)->sculpt_tool != SCULPT_TOOL_SIMPLIFY)
- do_symmetrical_brush_actions(sd, ob, do_brush_action);
+ do_symmetrical_brush_actions(sd, ob, do_brush_action);
sculpt_combine_proxies(sd, ob);