diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-13 11:52:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-13 11:52:40 +0300 |
| commit | ef423d9876378bf7568da69b70594f1d5d18f376 (patch) | |
| tree | 0dd3ed747ce017e6294e22c3516afa509fb12b62 /source/blender/editors/interface | |
| parent | 80a983ae5e506850e94f8a9bd410d2b1eca5691f (diff) | |
| parent | f4213c1408619d1071004247ed099e2ba98a3e9a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface')
| -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 0b91a1c7aad..6df54c0a31c 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -979,14 +979,12 @@ static bool ui_but_event_operator_string_from_menu( BLI_assert(mt != NULL); bool found = false; - IDProperty *prop_menu, *prop_menu_name; + IDProperty *prop_menu; /* annoying, create a property */ IDPropertyTemplate val = {0}; prop_menu = IDP_New(IDP_GROUP, &val, __func__); /* dummy, name is unimportant */ - IDP_AddToGroup(prop_menu, (prop_menu_name = IDP_NewString("", "name", sizeof(mt->idname)))); - - IDP_AssignString(prop_menu_name, mt->idname, sizeof(mt->idname)); + IDP_AddToGroup(prop_menu, IDP_NewString(mt->idname, "name", sizeof(mt->idname))); if (WM_key_event_operator_string( C, "WM_OT_call_menu", WM_OP_INVOKE_REGION_WIN, prop_menu, true, |