diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-10-31 19:38:53 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-10-31 19:38:53 +0300 |
| commit | c8de666cbe95403b4e902f10007ef94ec1808c04 (patch) | |
| tree | f15008e697c946a6488087109dbe3c524ebeabbe /source/blenderplayer | |
| parent | 3a72f02d800006d77a6f3ba9597f059c77ce6553 (diff) | |
| parent | 4e33d07565a4bc1c6702d0e4edf5c04392f7d5a6 (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 31a636e4a85..6243b65c197 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -733,6 +733,7 @@ void uiTemplateCacheFile(uiLayout *layout, struct bContext *C, struct PointerRNA struct RenderResult *RE_engine_begin_result(RenderEngine *engine, int x, int y, int w, int h, const char *layername, const char *viewname) RET_NULL struct RenderResult *RE_AcquireResultRead(struct Render *re) RET_NULL struct RenderResult *RE_AcquireResultWrite(struct Render *re) RET_NULL +struct RenderResult *RE_engine_get_result(struct RenderEngine *re) RET_NULL struct RenderStats *RE_GetStats(struct Render *re) RET_NULL struct RenderData *RE_engine_get_render_data(struct Render *re) RET_NULL void RE_engine_update_result(struct RenderEngine *engine, struct RenderResult *result) RET_NONE |