diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 17:21:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 17:27:03 +0300 |
| commit | 941484ff81744ad2dca1741f3e9c4b4c18664a82 (patch) | |
| tree | 3d80e516e39a7d55be8439c2ce3e06943de0a3f6 /source/blender/makesrna/intern/rna_ui_api.c | |
| parent | 0dd98af2559b89149f2b6ae586969c0544c26369 (diff) | |
| parent | 7fb393f9ba3866026c8fb2c5c5ef7e0906cfe8b4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_ui_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_ui_api.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index 5e36250497c..267ac16e1be 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, @@ -213,8 +215,7 @@ static void rna_uiItemMenuEnumO(uiLayout *layout, bContext *C, const char *opnam /* Get translated name (label). */ name = rna_translate_ui_text(name, text_ctxt, ot->srna, NULL, translate); - /* XXX This will search operator again :( */ - uiItemMenuEnumO(layout, C, opname, propname, name, icon); + uiItemMenuEnumO_ptr(layout, C, ot, propname, name, icon); } static void rna_uiItemL(uiLayout *layout, const char *name, const char *text_ctxt, int translate, |