Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-03-13 09:27:11 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-03-13 09:27:11 +0300
commit1f0b21e713b00ed56e5a7606b9fd8c719ff3b3bb (patch)
tree889e4c1ca0ae57c9857ba368d8f34ba73a61e2c2 /source/blender/render
parentfa823f0af8675be076c1a43c09b56dfa0f27010d (diff)
Cleanup: pass const args (mostly Scene & RenderData)
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/extern/include/RE_engine.h2
-rw-r--r--source/blender/render/intern/include/render_result.h4
-rw-r--r--source/blender/render/intern/source/external_engine.c2
-rw-r--r--source/blender/render/intern/source/render_result.c4
4 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h
index 88614de1641..38cba264a01 100644
--- a/source/blender/render/extern/include/RE_engine.h
+++ b/source/blender/render/extern/include/RE_engine.h
@@ -198,7 +198,7 @@ void RE_engine_set_error_message(RenderEngine *engine, const char *msg);
int RE_engine_render(struct Render *re, int do_all);
-bool RE_engine_is_external(struct Render *re);
+bool RE_engine_is_external(const struct Render *re);
void RE_engine_frame_set(struct RenderEngine *engine, int frame, float subframe);
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h
index 3c089335115..fabbd5fb096 100644
--- a/source/blender/render/intern/include/render_result.h
+++ b/source/blender/render/intern/include/render_result.h
@@ -57,7 +57,7 @@ struct RenderResult *render_result_new_from_exr(
void *exrhandle, const char *colorspace, bool predivide, int rectx, int recty);
void render_result_view_new(struct RenderResult *rr, const char *viewname);
-void render_result_views_new(struct RenderResult *rr, struct RenderData *rd);
+void render_result_views_new(struct RenderResult *rr, const struct RenderData *rd);
/* Merge */
@@ -110,7 +110,7 @@ bool render_result_exr_file_cache_read(struct Render *re);
/* Combined Pixel Rect */
struct ImBuf *render_result_rect_to_ibuf(struct RenderResult *rr,
- struct RenderData *rd,
+ const struct RenderData *rd,
const int view_id);
void render_result_rect_fill_zero(struct RenderResult *rr, const int view_id);
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 598f300cf86..4fcb5f5f16e 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -116,7 +116,7 @@ RenderEngineType *RE_engines_find(const char *idname)
return type;
}
-bool RE_engine_is_external(Render *re)
+bool RE_engine_is_external(const Render *re)
{
return (re->engine && re->engine->type && re->engine->type->render);
}
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index 2021967b05d..4e20dd51122 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -798,7 +798,7 @@ void render_result_view_new(RenderResult *rr, const char *viewname)
BLI_strncpy(rv->name, viewname, sizeof(rv->name));
}
-void render_result_views_new(RenderResult *rr, RenderData *rd)
+void render_result_views_new(RenderResult *rr, const RenderData *rd)
{
SceneRenderView *srv;
@@ -1459,7 +1459,7 @@ bool render_result_exr_file_cache_read(Render *re)
/*************************** Combined Pixel Rect *****************************/
-ImBuf *render_result_rect_to_ibuf(RenderResult *rr, RenderData *rd, const int view_id)
+ImBuf *render_result_rect_to_ibuf(RenderResult *rr, const RenderData *rd, const int view_id)
{
ImBuf *ibuf = IMB_allocImBuf(rr->rectx, rr->recty, rd->im_format.planes, 0);
RenderView *rv = RE_RenderViewGetById(rr, view_id);