diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-20 12:45:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-20 12:45:03 +0300 |
| commit | a8777f905846f80385fc90135e000c3169bbefc6 (patch) | |
| tree | 928a7db22a8553abd35f99a0afe2990be87d69ac /source/blender/render/extern/include/RE_pipeline.h | |
| parent | c0c696b014e3c21b923a2c21fb33a18839a3faa3 (diff) | |
| parent | 65af15ad887b30e678db9acab75efc7897c9197e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render/extern/include/RE_pipeline.h')
| -rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 243aff8ae54..81e411700fa 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -316,7 +316,7 @@ void RE_PreviewRender(struct Render *re, struct Main *bmain, struct Scene *scene bool RE_ReadRenderResult(struct Scene *scene, struct Scene *scenode); bool RE_WriteRenderResult( struct ReportList *reports, RenderResult *rr, const char *filename, - struct ImageFormatData *imf, const char *view, const int layer); + struct ImageFormatData *imf, const char *view, int layer); struct RenderResult *RE_MultilayerConvert( void *exrhandle, const char *colorspace, bool predivide, int rectx, int recty); |