[Bf-blender-cvs] [61e2384b7a8] master: Cleanup: compiler warnings

Campbell Barton noreply at git.blender.org
Thu Jan 6 04:06:09 CET 2022


Commit: 61e2384b7a82e404ae479d9fb3ead1fbfe0c0e43
Author: Campbell Barton
Date:   Thu Jan 6 13:54:49 2022 +1100
Branches: master
https://developer.blender.org/rB61e2384b7a82e404ae479d9fb3ead1fbfe0c0e43

Cleanup: compiler warnings

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

M	source/blender/editors/render/render_opengl.cc
M	source/blender/editors/render/render_preview.cc

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

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 {



More information about the Bf-blender-cvs mailing list