diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2019-01-18 03:47:32 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2019-01-18 03:47:32 +0300 |
| commit | 031a9d6424815ce73897e25800356c9888b1cde2 (patch) | |
| tree | a6c194a7fc58e412f434673363eb0fa6892e31af /source/blender/render/intern/include | |
| parent | 2757469824bbe98d943b42f57ff23782b97a3abf (diff) | |
| parent | c9eef24903479a70783efb2e00766d0eeec43823 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/render/intern/include')
| -rw-r--r-- | source/blender/render/intern/include/render_result.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h index ab7eee128f0..707b1f6e2a6 100644 --- a/source/blender/render/intern/include/render_result.h +++ b/source/blender/render/intern/include/render_result.h @@ -44,6 +44,7 @@ struct ImBuf; struct ListBase; struct Render; struct RenderData; +struct RenderEngine; struct RenderLayer; struct RenderResult; struct Scene; @@ -83,8 +84,8 @@ void render_result_single_layer_end(struct Render *re); /* EXR Tile File Render */ void render_result_save_empty_result_tiles(struct Render *re); -void render_result_exr_file_begin(struct Render *re); -void render_result_exr_file_end(struct Render *re); +void render_result_exr_file_begin(struct Render *re, struct RenderEngine *engine); +void render_result_exr_file_end(struct Render *re, struct RenderEngine *engine); /* render pass wrapper for gpencil */ struct RenderPass *gp_add_pass(struct RenderResult *rr, struct RenderLayer *rl, int channels, const char *name, const char *viewname); @@ -92,7 +93,7 @@ struct RenderPass *gp_add_pass(struct RenderResult *rr, struct RenderLayer *rl, void render_result_exr_file_merge(struct RenderResult *rr, struct RenderResult *rrpart, const char *viewname); void render_result_exr_file_path(struct Scene *scene, const char *layname, int sample, char *filepath); -int render_result_exr_file_read_sample(struct Render *re, int sample); +int render_result_exr_file_read_sample(struct Render *re, int sample, struct RenderEngine *engine); int render_result_exr_file_read_path(struct RenderResult *rr, struct RenderLayer *rl_single, const char *filepath); /* EXR cache */ |