[Bf-blender-cvs] [e2585c23421] master: Fix compiler warning

Joshua Leung noreply at git.blender.org
Sun Nov 19 14:09:30 CET 2017


Commit: e2585c23421bf81e41f03e04861caf71aaa7e10a
Author: Joshua Leung
Date:   Mon Nov 20 02:08:55 2017 +1300
Branches: master
https://developer.blender.org/rBe2585c23421bf81e41f03e04861caf71aaa7e10a

Fix compiler warning

--> render_result.c:832 - formal parameter 6 different from declaration

===================================================================

M	source/blender/render/extern/include/RE_pipeline.h

===================================================================

diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index c7b7b35474e..830f6a0bbf1 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -310,7 +310,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);



More information about the Bf-blender-cvs mailing list