diff options
| author | Philipp Oeser <lichtwerk> | 2020-09-03 15:59:34 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-09-03 16:01:50 +0300 |
| commit | f00cb93dbec7bf5dc05302c868f20fcd5aed7db7 (patch) | |
| tree | 2631292eb3265ad366165ea0fe567d31a1f1f1b5 /source/blender/makesdna | |
| parent | a505a85873602a9e265bafb107d2ea356fc23a17 (diff) | |
Fix T63125: Gpencil: bones cannot be selected in weightpaint mode
Some underlying functionality was not ready for greasepencil:
- BKE_modifiers_get_virtual_modifierlist (now introduce dedicated BKE_gpencil_modifiers_get_virtual_modifierlist)
- BKE_modifiers_is_deformed_by_armature
- checks in drawing code
- checks in (pose) selection code
A couple of changes to make this work:
- `eGpencilModifierType_Armature` has to be respected (not only `eModifierType_Armature`)
- `OB_MODE_WEIGHT_GPENCIL` has to be respected (not only `OB_MODE_WEIGHT_PAINT`) -- (now use new `OB_MODE_ALL_WEIGHT_PAINT`)
- `gpencil_weightmode_toggle_exec` now shares functionality from `wpaint_mode_toggle_exec` -- moved to new `ED_object_posemode_set_for_weight_paint`
This patch will also set the context member "weight_paint_object" for greasepencil (otherwise some appropriate pose operators wont work when in weightpaint mode)
Reviewed By: campbellbarton
Maniphest Tasks: T63125
Differential Revision: https://developer.blender.org/D8483
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_gpencil_modifier_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_enums.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h index 3049c0f8bab..bf268ae7c2d 100644 --- a/source/blender/makesdna/DNA_gpencil_modifier_types.h +++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h @@ -58,6 +58,7 @@ typedef enum GpencilModifierMode { eGpencilModifierMode_Render = (1 << 1), eGpencilModifierMode_Editmode = (1 << 2), eGpencilModifierMode_Expanded_DEPRECATED = (1 << 3), + eGpencilModifierMode_Virtual = (1 << 4), } GpencilModifierMode; typedef enum { diff --git a/source/blender/makesdna/DNA_object_enums.h b/source/blender/makesdna/DNA_object_enums.h index dbbd72c2075..c230cc3c872 100644 --- a/source/blender/makesdna/DNA_object_enums.h +++ b/source/blender/makesdna/DNA_object_enums.h @@ -60,6 +60,9 @@ typedef enum eDrawType { /** Any mode that uses Object.sculpt. */ #define OB_MODE_ALL_SCULPT (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT) +/** Any mode that uses weightpaint. */ +#define OB_MODE_ALL_WEIGHT_PAINT (OB_MODE_WEIGHT_PAINT | OB_MODE_WEIGHT_GPENCIL) + /** * Any mode that has data or for Grease Pencil modes, we need to free when switching modes, * see: #ED_object_mode_generic_exit |