[Bf-blender-cvs] [876d1bfe4ec] master: Cleanup: quiet MSVC warning using flag flag operations on boolean

Campbell Barton noreply at git.blender.org
Wed Aug 31 07:05:21 CEST 2022


Commit: 876d1bfe4ecbf6065bf86716a456ea8d6fa0c084
Author: Campbell Barton
Date:   Wed Aug 31 14:26:46 2022 +1000
Branches: master
https://developer.blender.org/rB876d1bfe4ecbf6065bf86716a456ea8d6fa0c084

Cleanup: quiet MSVC warning using flag flag operations on boolean

While harmless it wasn't clear if other bits might be set but ignored,
assign the value instead.

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

M	source/blender/render/intern/pipeline.cc

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

diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc
index 8cc1293eae3..746adeaddb2 100644
--- a/source/blender/render/intern/pipeline.cc
+++ b/source/blender/render/intern/pipeline.cc
@@ -1948,15 +1948,17 @@ bool RE_WriteRenderViewsMovie(ReportList *reports,
 
       IMB_colormanagement_imbuf_for_write(ibuf, true, false, &image_format);
 
-      ok &= mh->append_movie(movie_ctx_arr[view_id],
-                             rd,
-                             preview ? scene->r.psfra : scene->r.sfra,
-                             scene->r.cfra,
-                             (int *)ibuf->rect,
-                             ibuf->x,
-                             ibuf->y,
-                             suffix,
-                             reports);
+      if (!mh->append_movie(movie_ctx_arr[view_id],
+                            rd,
+                            preview ? scene->r.psfra : scene->r.sfra,
+                            scene->r.cfra,
+                            (int *)ibuf->rect,
+                            ibuf->x,
+                            ibuf->y,
+                            suffix,
+                            reports)) {
+        ok = false;
+      }
 
       /* imbuf knows which rects are not part of ibuf */
       IMB_freeImBuf(ibuf);
@@ -1979,7 +1981,7 @@ bool RE_WriteRenderViewsMovie(ReportList *reports,
 
     ibuf_arr[2] = IMB_stereo3d_ImBuf(&image_format, ibuf_arr[0], ibuf_arr[1]);
 
-    ok = mh->append_movie(movie_ctx_arr[0],
+    if (!mh->append_movie(movie_ctx_arr[0],
                           rd,
                           preview ? scene->r.psfra : scene->r.sfra,
                           scene->r.cfra,
@@ -1987,7 +1989,9 @@ bool RE_WriteRenderViewsMovie(ReportList *reports,
                           ibuf_arr[2]->x,
                           ibuf_arr[2]->y,
                           "",
-                          reports);
+                          reports)) {
+      ok = false;
+    }
 
     for (i = 0; i < 3; i++) {
       /* imbuf knows which rects are not part of ibuf */



More information about the Bf-blender-cvs mailing list