diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-09 11:31:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-09 11:31:15 +0400 |
commit | aa6d7ebd145ff375a9dc876d33065f80d94accca (patch) | |
tree | 4c9562c2575294c94bd55cb4b3bd25a9e7e793b6 /source/blenderplayer | |
parent | 9d0186fc6a5aa0aab36b9a1f52e3cd5e1ac46767 (diff) | |
parent | 8714fb7019e853703ce8b102edac43d84b7bbe14 (diff) |
svn merge ^/trunk/blender -r40720:40872
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 1c09792dbd8..48ea958f4b7 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -387,6 +387,7 @@ void uiTemplateHistogram(struct uiLayout *layout, struct PointerRNA *ptr, char * void uiTemplateReportsBanner(struct uiLayout *layout, struct bContext *C, struct wmOperator *op){} void uiTemplateWaveform(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int expand){} void uiTemplateVectorscope(struct uiLayout *_self, struct PointerRNA *data, char* property, int expand){} +void uiTemplateKeymapItemProperties(struct uiLayout *layout, struct PointerRNA *ptr){} /* rna render */ struct RenderResult *RE_engine_begin_result(struct RenderEngine *engine, int x, int y, int w, int h){return (struct RenderResult *) NULL;} |