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

LibOverride: Fix getting proper RNA path and ID from embedded ones.

Browse Source 
Master collections and root node trees should now be working as expected
in that regard.
This commit is contained in:
Bastien Montagne
2020-07-16 11:03:11 +02:00
parent 35bfe1702c
commit 7e0bf7a0f1
7 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1500,10 +1500,10 @@ static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block)
}
}
void ui_but_override_flag(uiBut *but)
void ui_but_override_flag(Main *bmain, uiBut *but)
{
const uint override_status = RNA_property_override_library_status(
&but->rnapoin, but->rnaprop, but->rnaindex);
bmain, &but->rnapoin, but->rnaprop, but->rnaindex);
if (override_status & RNA_OVERRIDE_STATUS_OVERRIDDEN) {
but->flag |= UI_BUT_OVERRIDEN;
@@ -1762,7 +1762,7 @@ void UI_block_end_ex(const bContext *C, uiBlock *block, const int xy[2], int r_x
}
ui_but_anim_flag(but, (scene) ? scene->r.cfra : 0.0f);
ui_but_override_flag(but);
ui_but_override_flag(CTX_data_main(C), but);
if (UI_but_is_decorator(but)) {
ui_but_anim_decorate_update_from_flag(but);
}