blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

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.
This commit is contained in:
Campbell Barton 2022-08-31 14:26:46 +10:00
parent 68d85ce208
commit 876d1bfe4e
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/render/intern/pipeline.cc
View File

@ -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 */