diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-08 03:11:43 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-08 03:11:43 +0300 |
| commit | da4bfb87703e49806aff5ce4ed75deaf8c7310e1 (patch) | |
| tree | 99e36bfd58cabfde9034e503e48a248b555f8977 /source/blenderplayer | |
| parent | 7b1d7074817dac9d0f088e8e7e5b336bae662c36 (diff) | |
| parent | 3f614cda12346c86e93937d6e94f5b0ff29dc5c1 (diff) | |
Merge branch 'master' into blender2.8
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 3a6dd7a4ad2..9255fdf308d 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -262,7 +262,7 @@ void RE_SetActiveRenderView(struct Render *re, const char *viewname) RET_NONE struct RenderPass *RE_pass_find_by_name(volatile struct RenderLayer *rl, const char *name, const char *viewname) RET_NULL struct RenderPass *RE_pass_find_by_type(volatile struct RenderLayer *rl, int passtype, const char *viewname) RET_NULL -bool RE_HasFakeLayer(RenderResult *res) RET_ZERO +bool RE_HasCombinedLayer(RenderResult *res) RET_ZERO /* zbuf.c stub */ void antialias_tagbuf(int xsize, int ysize, char *rectmove) RET_NONE |