diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-30 06:42:18 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-30 07:48:39 +0300 |
| commit | e83d4d963766487919edb8858de0020ef2c3cfe8 (patch) | |
| tree | 71e6c2b81ad7d7b349afc0b6c1e75e2eccb2373d /source/blender/makesdna/DNA_scene_types.h | |
| parent | 95a9646c00a1cbf727f24c506c4aeffe99016352 (diff) | |
UI: reorganize proportional editing options
- Move connected & projected into individual toggles.
- Top-level proportional editing button now only toggles.
- Use popover for proportional edit-mode falloff and options.
Note that it's no longer possible to toggle connected via key bindings,
although this could be supported again if it's needed.
Resolves T58081
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 28eb481ffd4..e3285a510ac 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1467,7 +1467,7 @@ typedef struct ToolSettings { char snap_target; char snap_transform_mode_flag; - char proportional, prop_mode; + char proportional_edit, prop_mode; /** Proportional edit, object mode. */ char proportional_objects; /** Proportional edit, mask editing. */ @@ -2078,11 +2078,12 @@ enum { #define PROP_INVSQUARE 7 #define PROP_MODE_MAX 8 -/* ToolSettings.proportional */ -#define PROP_EDIT_OFF 0 -#define PROP_EDIT_ON 1 -#define PROP_EDIT_CONNECTED 2 -#define PROP_EDIT_PROJECTED 3 +/** #ToolSettings.proportional_edit & similarly named members. */ +enum { + PROP_EDIT_USE = (1 << 0), + PROP_EDIT_CONNECTED = (1 << 1), + PROP_EDIT_PROJECTED = (1 << 2), +}; /* ToolSettings.weightuser */ enum { |