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>2022-01-06 05:54:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2022-01-06 05:54:49 +0300
commit61e2384b7a82e404ae479d9fb3ead1fbfe0c0e43 (patch)
tree6d5e92afce39d3dab97e339edcc6d7114223bae9 /source/blender/editors/render
parent60757f010ab1c45f1f25f7042d99b311bcd3c154 (diff)
Cleanup: compiler warnings
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r--source/blender/editors/render/render_opengl.cc2
-rw-r--r--source/blender/editors/render/render_preview.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc
index 9b4f636431d..263c51f3488 100644
--- a/source/blender/editors/render/render_opengl.cc
+++ b/source/blender/editors/render/render_opengl.cc
@@ -727,7 +727,7 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
const bool is_sequencer = RNA_boolean_get(op->ptr, "sequencer");
const bool is_write_still = RNA_boolean_get(op->ptr, "write_still");
const eImageFormatDepth color_depth = static_cast<eImageFormatDepth>(
- (is_animation) ? scene->r.im_format.depth : R_IMF_CHAN_DEPTH_32);
+ (is_animation) ? (eImageFormatDepth)scene->r.im_format.depth : R_IMF_CHAN_DEPTH_32);
char err_out[256] = "unknown";
if (G.background) {
diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc
index d560223f17f..dc773504807 100644
--- a/source/blender/editors/render/render_preview.cc
+++ b/source/blender/editors/render/render_preview.cc
@@ -534,7 +534,7 @@ static Scene *preview_prepare_scene(
const ePreviewType preview_type = static_cast<ePreviewType>(
(sp->pr_method == PR_ICON_RENDER && sp->pr_main == G_pr_main_grease_pencil) ?
MA_SPHERE_A :
- mat->pr_type);
+ (ePreviewType)mat->pr_type);
set_preview_visibility(pr_main, sce, view_layer, preview_type, sp->pr_method);
}
else {