diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 08:58:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 09:04:55 +0300 |
commit | 98052162e1338cb8f97832c3e7e1d65d8bfd9b3f (patch) | |
tree | 143732bf22c86824f18b1d6142c0942340738e11 /source/blender/makesrna/intern/rna_ui_api.c | |
parent | fe3571b3620f66d352e7eac74fa0066e50ab7837 (diff) |
UI: replace UI_ITEM_O_RETURN_PROPS /w return arg
Means we can have a version of this function that returns the button
and avoids returning a struct that often isn't used.
Diffstat (limited to 'source/blender/makesrna/intern/rna_ui_api.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_ui_api.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index be5a823034e..c3a16c476bc 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -194,10 +194,12 @@ static PointerRNA rna_uiItemO(uiLayout *layout, const char *opname, const char * icon = icon_value; } - flag = UI_ITEM_O_RETURN_PROPS; + flag = 0; flag |= (emboss) ? 0 : UI_ITEM_R_NO_BG; - return uiItemFullO_ptr(layout, ot, name, icon, NULL, uiLayoutGetOperatorContext(layout), flag); + PointerRNA opptr; + uiItemFullO_ptr(layout, ot, name, icon, NULL, uiLayoutGetOperatorContext(layout), flag, &opptr); + return opptr; } static void rna_uiItemMenuEnumO(uiLayout *layout, bContext *C, const char *opname, const char *propname, const char *name, |