diff options
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface.c | 6 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_ops.c | 10 |
3 files changed, 8 insertions, 12 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index a4eaf800801..d6385276b1a 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1221,11 +1221,9 @@ static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block) void ui_but_override_flag(uiBut *but) { - bool is_overridden; + const int override_status = RNA_property_override_status(&but->rnapoin, but->rnaprop, but->rnaindex); - RNA_property_override_status(&but->rnapoin, but->rnaprop, but->rnaindex, NULL, &is_overridden, NULL, NULL); - - if (is_overridden) { + if (override_status & RNA_OVERRIDE_STATUS_OVERRIDDEN) { but->flag |= UI_BUT_OVERRIDEN; } else { diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 3a01ff16297..b1dc30945c4 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6819,11 +6819,11 @@ static bool ui_but_menu(bContext *C, uiBut *but) const PropertySubType subtype = RNA_property_subtype(prop); bool is_anim = RNA_property_animateable(ptr, prop); bool is_editable = RNA_property_editable(ptr, prop); - bool is_overridable; /*bool is_idprop = RNA_property_is_idprop(prop);*/ /* XXX does not work as expected, not strictly needed */ bool is_set = RNA_property_is_set(ptr, prop); - RNA_property_override_status(ptr, prop, -1, &is_overridable, NULL, NULL, NULL); + const int override_status = RNA_property_override_status(ptr, prop, -1); + const bool is_overridable = (override_status & RNA_OVERRIDE_STATUS_OVERRIDABLE) != 0; /* second slower test, saved people finding keyframe items in menus when its not possible */ if (is_anim) diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 16525dfbc9e..ad4aaf59998 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -482,13 +482,12 @@ static int override_type_set_button_poll(bContext *C) PointerRNA ptr; PropertyRNA *prop; int index; - bool is_overridable; UI_context_active_but_prop_get(C, &ptr, &prop, &index); - RNA_property_override_status(&ptr, prop, index, &is_overridable, NULL, NULL, NULL); + const int override_status = RNA_property_override_status(&ptr, prop, index); - return (ptr.data && prop && is_overridable); + return (ptr.data && prop && (override_status & RNA_OVERRIDE_STATUS_OVERRIDABLE)); } static int override_type_set_button_exec(bContext *C, wmOperator *op) @@ -572,13 +571,12 @@ static int override_remove_button_poll(bContext *C) PointerRNA ptr; PropertyRNA *prop; int index; - bool is_overridden; UI_context_active_but_prop_get(C, &ptr, &prop, &index); - RNA_property_override_status(&ptr, prop, index, NULL, &is_overridden, NULL, NULL); + const int override_status = RNA_property_override_status(&ptr, prop, index); - return (ptr.data && ptr.id.data && prop && is_overridden); + return (ptr.data && ptr.id.data && prop && (override_status & RNA_OVERRIDE_STATUS_OVERRIDDEN)); } static int override_remove_button_exec(bContext *C, wmOperator *op) |