[Bf-blender-cvs] [dce7917717c] master: Sculpt: Invert Expand behavior for masking consistency
Joseph Eagar
noreply at git.blender.org
Tue Dec 27 06:47:33 CET 2022
Commit: dce7917717cd9f07466651cdb9659a247f1a19ee
Author: Joseph Eagar
Date: Mon Dec 26 21:46:33 2022 -0800
Branches: master
https://developer.blender.org/rBdce7917717cd9f07466651cdb9659a247f1a19ee
Sculpt: Invert Expand behavior for masking consistency
This patch makes sure that each of the expand keymap entries will use consistent "invert" and "use_mask_preserve" properties.
Based on previous discussions we decided to flip the default Mask Expand behavior.
This has multiple benefited:
- The mask creation is more consistent with other masking tools (Always add to existing mask. Mask selected areas)
- It's easier to use expanding for masking face sets (Snapping with `Ctrl`) or building a mask from repeated operations
- It's less likely to mask certain areas unintentionally (Loose mesh islands)
- If the current behavior is desired for an expand operation the user can use `E` & `F` in the modal keymap (Which is less often the case).
If we want to revisit the original design of inverted masking again in the future we should do this via {T97903}.
Reviewed By: Joseph Eagar
Differential Revision https://developer.blender.org/D16434
Ref D16434
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 7712f75fc64..d9e17302177 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -5049,20 +5049,31 @@ def km_sculpt(params):
{"properties": [("mode", 'SMOOTH')]}),
# Expand
("sculpt.expand", {"type": 'A', "value": 'PRESS', "shift": True},
- {"properties": [("target", "MASK"), ("falloff_type", "GEODESIC"), ("invert", True)]}),
+ {"properties": [
+ ("target", "MASK"),
+ ("falloff_type", "GEODESIC"),
+ ("invert", True),
+ ("use_auto_mask", True),
+ ("use_mask_preserve" , True)]}),
("sculpt.expand", {"type": 'A', "value": 'PRESS', "shift": True, "alt": True},
- {"properties": [("target", "MASK"), ("falloff_type", "NORMALS"), ("invert", False)]}),
+ {"properties": [
+ ("target", "MASK"),
+ ("falloff_type", "NORMALS"),
+ ("invert", False),
+ ("use_mask_preserve" , True)]}),
("sculpt.expand", {"type": 'W', "value": 'PRESS', "shift": True},
{"properties": [
("target", "FACE_SETS"),
("falloff_type", "GEODESIC"),
("invert", False),
+ ("use_mask_preserve" , False),
("use_modify_active", False)]}),
("sculpt.expand", {"type": 'W', "value": 'PRESS', "shift": True, "alt": True},
{"properties": [
("target", "FACE_SETS"),
("falloff_type", "BOUNDARY_FACE_SET"),
("invert", False),
+ ("use_mask_preserve" , False),
("use_modify_active", True),
]}),
# Partial Visibility Show/hide
More information about the Bf-blender-cvs
mailing list