archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Rename: RNA_property_override_status > RNA_property_static_override_status

Browse Source
This commit is contained in:
Dalai Felinto
2018-05-09 16:17:15 +02:00
parent c67a0580fc
commit 1ce1ae3d32
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/interface/interface.c
View File

@@ -1128,7 +1128,7 @@ static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block)
void ui_but_override_flag(uiBut *but)
{
const int override_status = RNA_property_override_status(&but->rnapoin, but->rnaprop, but->rnaindex);
const int override_status = RNA_property_static_override_status(&but->rnapoin, but->rnaprop, but->rnaindex);
if (override_status & RNA_OVERRIDE_STATUS_OVERRIDDEN) {
but->flag |= UI_BUT_OVERRIDEN;

2
source/blender/editors/interface/interface_handlers.c
View File

@@ -6663,7 +6663,7 @@ static bool ui_but_menu(bContext *C, uiBut *but)
/*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);
const int override_status = RNA_property_override_status(ptr, prop, -1);
const int override_status = RNA_property_static_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 */

4
source/blender/editors/interface/interface_ops.c
View File

@@ -363,7 +363,7 @@ static int override_type_set_button_poll(bContext *C)
UI_context_active_but_prop_get(C, &ptr, &prop, &index);
const int override_status = RNA_property_override_status(&ptr, prop, index);
const int override_status = RNA_property_static_override_status(&ptr, prop, index);
return (ptr.data && prop && (override_status & RNA_OVERRIDE_STATUS_OVERRIDABLE));
}
@@ -457,7 +457,7 @@ static int override_remove_button_poll(bContext *C)
UI_context_active_but_prop_get(C, &ptr, &prop, &index);
const int override_status = RNA_property_override_status(&ptr, prop, index);
const int override_status = RNA_property_static_override_status(&ptr, prop, index);
return (ptr.data && ptr.id.data && prop && (override_status & RNA_OVERRIDE_STATUS_OVERRIDDEN));
}

2
source/blender/makesrna/RNA_access.h
View File

@@ -1291,7 +1291,7 @@ struct IDOverrideStaticPropertyOperation *RNA_property_override_property_operati
PointerRNA *ptr, PropertyRNA *prop, const short operation, const int index,
const bool strict, bool *r_strict, bool *r_created);
eRNAOverrideStatus RNA_property_override_status(PointerRNA *ptr, PropertyRNA *prop, const int index);
eRNAOverrideStatus RNA_property_static_override_status(PointerRNA *ptr, PropertyRNA *prop, const int index);
void RNA_struct_state_owner_set(const char *name);
const char *RNA_struct_state_owner_get(void);

2
source/blender/makesrna/intern/rna_access.c
View File

@@ -7825,7 +7825,7 @@ IDOverrideStaticPropertyOperation *RNA_property_override_property_operation_get(
return BKE_override_static_property_operation_get(op, operation, NULL, NULL, index, index, strict, r_strict, r_created);
}
eRNAOverrideStatus RNA_property_override_status(PointerRNA *ptr, PropertyRNA *prop, const int index)
eRNAOverrideStatus RNA_property_static_override_status(PointerRNA *ptr, PropertyRNA *prop, const int index)
{
int override_status = 0;