blender/blender
142
451
Fork 651
Code Issues 6.5k Pull Requests 823 Projects 18 Wiki Activity

GPv3: Cyclical set operator #111904

Merged
Falk David merged 16 commits from casey-bianco-davis/blender:GPv3-cyclical-set-operator into main 2023-10-20 10:12:34 +02:00
Conversation 3 Commits 16 Files Changed 5 +1 -4
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e8352e599a - Show all commits

2
scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -4611,7 +4611,7 @@ def km_grease_pencil_edit(params):
# Keyframe Menu
op_menu("VIEW3D_MT_edit_greasepencil_animation", {"type": 'I', "value": 'PRESS'}),
# Cyclical set
("grease_pencil.cyclical_set", {"type": 'F', "value": 'PRESS'}, {"properties": [("type", "CLOSE"), ("geometry", True)]}),
("grease_pencil.cyclical_set", {"type": 'F', "value": 'PRESS'}, {"properties": [("type", "CLOSE")]}),
("grease_pencil.cyclical_set", {"type": 'C', "value": 'PRESS', "alt": True}, {"properties": [("type", "TOGGLE")]}),
])

3
source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
View File

@ -872,8 +872,6 @@ static int grease_pencil_cyclical_set_exec(bContext *C, wmOperator *op)
static void GREASE_PENCIL_OT_cyclical_set(wmOperatorType *ot)
{
PropertyRNA *prop;
/* Identifiers. */
ot->name = "Set Cyclical State";
ot->idname = "GREASE_PENCIL_OT_cyclical_set";
@ -889,7 +887,6 @@ static void GREASE_PENCIL_OT_cyclical_set(wmOperatorType *ot)
/* Simplify parameters. */
ot->prop = RNA_def_enum(
ot->srna, "type", prop_cyclical_types, int(CyclicalMode::TOGGLE), "Type", "");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}
/** \} */