diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 19:04:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 19:04:54 +0400 |
| commit | a7b0a11811ccdbf83301891c03a50c1d5daf4776 (patch) | |
| tree | 165521a6533e9069c455dbccda87b944ae7a1c25 /source/blenderplayer | |
| parent | b308e613126f8c89e954705aa512a3ef6a1f551d (diff) | |
| parent | 6ce92d09f77351b3ad882e8d8f6d6b1511e91844 (diff) | |
svn merge ^/trunk/blender -r43278:43294
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index db1c3fbd07e..4f79121f38e 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -383,7 +383,7 @@ void uiItemBooleanO(struct uiLayout *layout, char *name, int icon, char *opname, void uiItemIntO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, int value){} void uiItemFloatO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, float value){} void uiItemStringO(struct uiLayout *layout, char *name, int icon, char *opname, char *propname, char *value){} -void uiItemL(struct uiLayout *layout, char *name, int icon){} +void uiItemL(struct uiLayout *layout, const char *name, int icon){} void uiItemM(struct uiLayout *layout, struct bContext *C, char *menuname, char *name, int icon){} void uiItemS(struct uiLayout *layout){} void uiItemFullR(struct uiLayout *layout, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, int value, int flag, char *name, int icon){} |