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/blender/render/extern/include/RE_engine.h | |
| parent | c47926542acf1fc342b4d0b8f7ccaf1e3a8be6d8 (diff) | |
| parent | ce28025eaf5014f16460dd1cb798ce5292087d94 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render/extern/include/RE_engine.h')
| -rw-r--r-- | source/blender/render/extern/include/RE_engine.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index 8091d4005fd..3086c9d4fad 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -152,7 +152,7 @@ void RE_result_load_from_file(struct RenderResult *result, struct ReportList *re struct RenderResult *RE_engine_begin_result(RenderEngine *engine, int x, int y, int w, int h, const char *layername, const char *viewname); void RE_engine_update_result(RenderEngine *engine, struct RenderResult *result); void RE_engine_add_pass(RenderEngine *engine, const char *name, int channels, const char *chan_id, const char *layername); -void RE_engine_end_result(RenderEngine *engine, struct RenderResult *result, int cancel, int merge_results); +void RE_engine_end_result(RenderEngine *engine, struct RenderResult *result, int cancel, int highlight, int merge_results); const char *RE_engine_active_view_get(RenderEngine *engine); void RE_engine_active_view_set(RenderEngine *engine, const char *viewname); |