diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 13:13:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 13:15:32 +0300 |
commit | e960920f2ff3c0484f4467adfc47df8e1df11e65 (patch) | |
tree | d4cf39bd97e15348d3855a6b75e4ebfdd1f78ee9 /source | |
parent | ab20901c9e0cd30ef9c6d3ef17c8fcbc45c14352 (diff) |
UI: decorator color button assert
Also set 'all' argument based on the RNA-index
(even though it worked, better set to correct value).
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/interface/interface_anim.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_layout.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c index f2b6ef03d98..624ba5dd55d 100644 --- a/source/blender/editors/interface/interface_anim.c +++ b/source/blender/editors/interface/interface_anim.c @@ -337,7 +337,7 @@ void ui_but_anim_decorate_cb(bContext *C, void *arg_but, void *UNUSED(arg_dummy) PointerRNA props_ptr; wmOperatorType *ot = WM_operatortype_find("ANIM_OT_keyframe_delete_button", false); WM_operator_properties_create_ptr(&props_ptr, ot); - RNA_boolean_set(&props_ptr, "all", false); + RNA_boolean_set(&props_ptr, "all", but->rnaindex == -1); WM_operator_name_call_ptr(C, ot, WM_OP_INVOKE_DEFAULT, &props_ptr); WM_operator_properties_free(&props_ptr); } @@ -345,7 +345,7 @@ void ui_but_anim_decorate_cb(bContext *C, void *arg_but, void *UNUSED(arg_dummy) PointerRNA props_ptr; wmOperatorType *ot = WM_operatortype_find("ANIM_OT_keyframe_insert_button", false); WM_operator_properties_create_ptr(&props_ptr, ot); - RNA_boolean_set(&props_ptr, "all", false); + RNA_boolean_set(&props_ptr, "all", but->rnaindex == -1); WM_operator_name_call_ptr(C, ot, WM_OP_INVOKE_DEFAULT, &props_ptr); WM_operator_properties_free(&props_ptr); } diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 7f270558892..9348ee1fe3a 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1724,7 +1724,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index BLI_insertlinkafter(&block->buttons, but_decorate, but); but_decorate = but->next; } - BLI_assert(len ? i == len : i == 1); + BLI_assert(len ? (ELEM(i, 1, len)) : i == 1); } #endif /* UI_PROP_DECORATE */ |