diff options
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/external_engine.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 02a9f1eb347..b9e06d3e6f7 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -132,7 +132,7 @@ struct Render short flag, osa, ok, result_ok; /* due to performance issues, getting initialized from color management settings once on Render initialization */ - short scene_color_manage; + bool scene_color_manage; /* result of rendering */ RenderResult *result; diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 6ae7d732e82..5255e574c41 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -121,7 +121,7 @@ RenderEngineType *RE_engines_find(const char *idname) return type; } -int RE_engine_is_external(Render *re) +bool RE_engine_is_external(Render *re) { RenderEngineType *type = RE_engines_find(re->r.engine); return (type && type->render); diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 39bc571853a..c0ef820b6d8 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2391,7 +2391,7 @@ static int check_composite_output(Scene *scene) return node_tree_has_composite_output(scene->nodetree); } -int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *reports) +bool RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *reports) { SceneRenderLayer *srl; int scemode = check_mode_full_sample(&scene->r); @@ -2659,7 +2659,7 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie /* write movie or image */ if (BKE_imtype_is_movie(scene->r.im_format.imtype)) { - int do_free = FALSE; + bool do_free = false; ImBuf *ibuf = render_result_rect_to_ibuf(&rres, &scene->r); /* note; the way it gets 32 bits rects is weak... */ |