[Bf-blender-cvs] [7fc11744e69] master: Revert commit, turns out this isn't a bug?

Joseph Eagar noreply at git.blender.org
Thu Oct 7 13:12:16 CEST 2021


Commit: 7fc11744e69aac2b87575c46132900eb95336088
Author: Joseph Eagar
Date:   Thu Oct 7 04:11:49 2021 -0700
Branches: master
https://developer.blender.org/rB7fc11744e69aac2b87575c46132900eb95336088

Revert commit, turns out this isn't a bug?

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

M	source/blender/editors/sculpt_paint/sculpt_expand.c

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

diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.c b/source/blender/editors/sculpt_paint/sculpt_expand.c
index 34da7daed65..40874375772 100644
--- a/source/blender/editors/sculpt_paint/sculpt_expand.c
+++ b/source/blender/editors/sculpt_paint/sculpt_expand.c
@@ -1243,12 +1243,7 @@ static void sculpt_expand_mask_update_task_cb(void *__restrict userdata,
     }
 
     if (expand_cache->preserve) {
-      if (expand_cache->invert) {
-        new_mask = min_ff(new_mask, expand_cache->original_mask[vd.index]);
-      }
-      else {
-        new_mask = max_ff(new_mask, expand_cache->original_mask[vd.index]);
-      }
+      new_mask = max_ff(new_mask, expand_cache->original_mask[vd.index]);
     }
 
     if (new_mask == initial_mask) {



More information about the Bf-blender-cvs mailing list