Merge branch 'blender-v2.90-release'

2020-08-12 16:05:23 +02:00
parent 6ef58099d4 21118fb610
commit 707c81cd11
1 changed files with 1 additions and 1 deletions
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -5914,7 +5914,7 @@ void SCULPT_flush_stroke_deform(Sculpt *sd, Object *ob, bool is_proxy_used)
  SculptSession *ss = ob->sculpt;
  Brush *brush = BKE_paint_brush(&sd->paint);

-  if (is_proxy_used) {
+  if (is_proxy_used && ss->deform_modifiers_active) {
    /* This brushes aren't using proxies, so sculpt_combine_proxies() wouldn't propagate needed
     * deformation to original base. */