diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-08-09 17:37:15 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-08-09 17:37:15 +0300 |
| commit | 4a801f6c6f0421ffd515c12422dd197441440520 (patch) | |
| tree | 5415e844b460bb2aa07b9467c72e13abc2e61228 /source/blender/render/intern/include/render_result.h | |
| parent | 49c63d46db8c055152d9e431e89405f9b51a4bbe (diff) | |
| parent | 02719521d2e25abcc8ffcccc086d3a651986f52f (diff) | |
Merge branch 'master' into object_nodesobject_nodes
Diffstat (limited to 'source/blender/render/intern/include/render_result.h')
| -rw-r--r-- | source/blender/render/intern/include/render_result.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h index 2619ac76d59..0c4f4e20325 100644 --- a/source/blender/render/intern/include/render_result.h +++ b/source/blender/render/intern/include/render_result.h @@ -83,6 +83,9 @@ 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); +/* render pass wrapper for gpencil */ +struct RenderPass *gp_add_pass(struct RenderResult *rr, struct RenderLayer *rl, int channels, int passtype, const char *viewname); + 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); |