diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-05-08 01:19:22 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-05-08 01:19:22 +0300 |
| commit | 9181f13af710f39e28368461f9979ce2052a55ee (patch) | |
| tree | bb4dae8ee41e31d25ba980aa996c3e62539a59e0 /source/blenderplayer | |
| parent | c47926542acf1fc342b4d0b8f7ccaf1e3a8be6d8 (diff) | |
| parent | ce28025eaf5014f16460dd1cb798ce5292087d94 (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 5e94481eb61..4ac138349b6 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -669,7 +669,7 @@ void RE_engine_update_result(struct RenderEngine *engine, struct RenderResult *r void RE_engine_update_progress(struct RenderEngine *engine, float progress) RET_NONE void RE_engine_set_error_message(RenderEngine *engine, const char *msg) RET_NONE void RE_engine_add_pass(RenderEngine *engine, const char *name, int channels, const char *chan_id, const char *layername) RET_NONE -void RE_engine_end_result(RenderEngine *engine, struct RenderResult *result, int cancel, int merge_results) RET_NONE +void RE_engine_end_result(RenderEngine *engine, struct RenderResult *result, int cancel, int highlight, int merge_results) RET_NONE void RE_engine_update_stats(RenderEngine *engine, const char *stats, const char *info) RET_NONE void RE_layer_load_from_file(struct RenderLayer *layer, struct ReportList *reports, const char *filename, int x, int y) RET_NONE void RE_result_load_from_file(struct RenderResult *result, struct ReportList *reports, const char *filename) RET_NONE |