tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: replace suspicious use of "&" with "&&"

This commit is contained in:
Campbell Barton 2024-04-01 22:11:39 +11:00
parent fa4fdbf356
commit 7ce68904eb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/gpencil_legacy/gpencil_paint.cc
View File

@ -1420,7 +1420,7 @@ static bool gpencil_stroke_eraser_is_occluded(
if (brush->gpencil_tool == GPAINT_TOOL_ERASE) {
gp_settings = brush->gpencil_settings;
}
else if ((eraser != nullptr) & (eraser->gpencil_tool == GPAINT_TOOL_ERASE)) {
else if ((eraser != nullptr) && (eraser->gpencil_tool == GPAINT_TOOL_ERASE)) {
gp_settings = eraser->gpencil_settings;
}

2
source/blender/sequencer/intern/render.cc
View File

@ -2253,7 +2253,7 @@ void SEQ_render_thumbnails(const SeqRenderData *context,
upper_thumb_bound;
float timeline_frame = SEQ_render_thumbnail_first_frame_get(scene, seq, frame_step, view_area);
while ((timeline_frame < upper_thumb_bound) & !*stop) {
while ((timeline_frame < upper_thumb_bound) && !*stop) {
ImBuf *ibuf = seq_cache_get(
context, seq_orig, round_fl_to_int(timeline_frame), SEQ_CACHE_STORE_THUMBNAIL);
if (ibuf) {