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:
authorPhilipp Oeser <info@graphics-engineer.com>2020-08-12 17:05:23 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-08-12 17:05:23 +0300
commit707c81cd112f4d851ff1f1cc55469eec6d58d2bb (patch)
tree1de62a02144cab6f6d183deb43fdab5dc3b352f8 /source/blender/editors/sculpt_paint/sculpt.c
parent6ef58099d4311e158c0b3e2eae55759432865939 (diff)
parent21118fb610c2cf693b2884086f3d5c1fe5183ea4 (diff)
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt.c')
-rw-r--r--source/blender/editors/sculpt_paint/sculpt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index c87189997f2..d91de6245ba 100644
--- 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. */