diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-01 21:29:26 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-01 21:29:26 +0300 |
| commit | a577499c7521c5fcfaefd58ec1d8940886563adc (patch) | |
| tree | 99282a1d920bd693933efeac4d69a6807bd0e974 /source/blender/render/intern/include | |
| parent | d16386e50bc104f9446a30e041a7b74f38b51ae9 (diff) | |
| parent | 4c3be0bf52292add5cdf23be5f4affb76f1b747d (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/render/intern/include')
| -rw-r--r-- | source/blender/render/intern/include/render_result.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h index 687927027f0..d7636a150ef 100644 --- a/source/blender/render/intern/include/render_result.h +++ b/source/blender/render/intern/include/render_result.h @@ -85,7 +85,6 @@ 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, struct RenderEngine *engine); int render_result_exr_file_read_path(struct RenderResult *rr, struct RenderLayer *rl_single, const char *filepath); /* EXR cache */ |