diff options
author | Hans Goudey <h.goudey@me.com> | 2021-07-02 23:24:06 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-07-02 23:24:06 +0300 |
commit | 1947cbfc4079038d0862a68376d100b1fc68082f (patch) | |
tree | 27a5b975c7f4d0bfadb225cfa84651d6046a37cf /source/blender/render/intern | |
parent | cc93e09b5d338ed68c10ffcd2e26e9a81fc310b4 (diff) | |
parent | 5f5cf21a833fb636627121ffd94a57ebf514fac6 (diff) |
Merge branch 'master' into refactor-vertex-group-names
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r-- | source/blender/render/intern/engine.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/render_result.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/render_result.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/render/intern/engine.c b/source/blender/render/intern/engine.c index 7316afc448e..db2458a636b 100644 --- a/source/blender/render/intern/engine.c +++ b/source/blender/render/intern/engine.c @@ -735,9 +735,9 @@ void RE_bake_engine_set_engine_parameters(Render *re, Main *bmain, Scene *scene) render_copy_renderdata(&re->r, &scene->r); } -bool RE_bake_has_engine(Render *re) +bool RE_bake_has_engine(const Render *re) { - RenderEngineType *type = RE_engines_find(re->r.engine); + const RenderEngineType *type = RE_engines_find(re->r.engine); return (type->bake != NULL); } diff --git a/source/blender/render/intern/render_result.c b/source/blender/render/intern/render_result.c index 83ed302ea46..70bd4f92512 100644 --- a/source/blender/render/intern/render_result.c +++ b/source/blender/render/intern/render_result.c @@ -804,9 +804,9 @@ void render_result_views_new(RenderResult *rr, const RenderData *rd) } } -bool render_result_has_views(RenderResult *rr) +bool render_result_has_views(const RenderResult *rr) { - RenderView *rv = rr->views.first; + const RenderView *rv = rr->views.first; return (rv && (rv->next || rv->name[0])); } diff --git a/source/blender/render/intern/render_result.h b/source/blender/render/intern/render_result.h index 67edd075e24..7732c113700 100644 --- a/source/blender/render/intern/render_result.h +++ b/source/blender/render/intern/render_result.h @@ -127,7 +127,7 @@ void render_result_rect_get_pixels(struct RenderResult *rr, void render_result_views_shallowcopy(struct RenderResult *dst, struct RenderResult *src); void render_result_views_shallowdelete(struct RenderResult *rr); -bool render_result_has_views(struct RenderResult *rr); +bool render_result_has_views(const struct RenderResult *rr); #define FOREACH_VIEW_LAYER_TO_RENDER_BEGIN(re_, iter_) \ { \ |