diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2018-03-19 23:53:48 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2018-03-19 23:53:48 +0300 |
| commit | aee5a80a83e48afc3b0b978b5087f8c05af6f54e (patch) | |
| tree | ef8d07c6e75c94ce306998534c76b84d1ffd369c /source/blender/editors/interface/interface.c | |
| parent | ec6545efad5fed99980fc3e2d5962b40fbeb12ae (diff) | |
| parent | 254bb922e8654a85b3c3e2c715cb4a078f832bcb (diff) | |
Merge branch 'blender2.8' into topbar
Diffstat (limited to 'source/blender/editors/interface/interface.c')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index bfaa986d1ca..a6d965d52e4 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 { |