diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-03 12:59:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-03 12:59:15 +0300 |
| commit | cd4f925f564a01d96038c83a9d39396e275f71a4 (patch) | |
| tree | e72edf52555925e6373a8831e97c5e78294e0f2a /source/blenderplayer | |
| parent | 4c53f2000f603e13c091c533bccc0e694b5d34ad (diff) | |
| parent | d19d094ca9bb4f05b0f95c9f168340050864f103 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 6243b65c197..c4053b31b48 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -634,6 +634,7 @@ void uiItemR(uiLayout *layout, struct PointerRNA *ptr, const char *propname, int void uiItemFullO(uiLayout *layout, const char *idname, const char *name, int icon, struct IDProperty *properties, int context, int flag, struct PointerRNA *r_opptr) RET_NONE void uiItemFullO_ptr(struct uiLayout *layout, struct wmOperatorType *ot, const char *name, int icon, struct IDProperty *properties, int context, int flag, struct PointerRNA *r_opptr) RET_NONE +void uiItemFullOMenuHold_ptr( uiLayout *layout, struct wmOperatorType *ot, const char *name, int icon, struct IDProperty *properties, int context, int flag, const char *menu_id, /* extra menu arg. */ PointerRNA *r_opptr) RET_NONE struct uiLayout *uiLayoutRow(uiLayout *layout, int align) RET_NULL struct uiLayout *uiLayoutColumn(uiLayout *layout, int align) RET_NULL struct uiLayout *uiLayoutColumnFlow(uiLayout *layout, int number, int align) RET_NULL |