diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/gpencil_modifier.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c index 33f84aff545..8361d8e1849 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier.c +++ b/source/blender/blenkernel/intern/gpencil_modifier.c @@ -677,7 +677,7 @@ static void copy_frame_to_eval_cb(bGPDlayer *gpl, * - When the frame is the layer's active frame (already handled in * gpencil_copy_visible_frames_to_eval). */ - if (gpf == NULL || gpf == gpl->actframe) { + if (ELEM(gpf, NULL, gpl->actframe)) { return; } diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index 000e51c0150..2edc51f6329 100644 --- a/source/blender/blenkernel/intern/image.cc +++ b/source/blender/blenkernel/intern/image.cc @@ -5148,7 +5148,7 @@ bool BKE_image_has_alpha(Image *image) const int planes = (ibuf ? ibuf->planes : 0); BKE_image_release_ibuf(image, ibuf, lock); - if (planes == 32 || planes == 16) { + if (ELEM(planes, 32, 16)) { return true; } diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index 9c0e5a5534e..bf1b1586db8 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -1228,7 +1228,7 @@ static void scene_blend_read_data(BlendDataReader *reader, ID *id) } /* Active channels root pointer. */ - if (ed->displayed_channels == old_displayed_channels || ed->displayed_channels == nullptr) { + if (ELEM(ed->displayed_channels, old_displayed_channels, nullptr)) { ed->displayed_channels = &ed->channels; } else { @@ -1263,7 +1263,7 @@ static void scene_blend_read_data(BlendDataReader *reader, ID *id) } } - if (ms->old_channels == old_displayed_channels || ms->old_channels == nullptr) { + if (ELEM(ms->old_channels, old_displayed_channels, nullptr)) { ms->old_channels = &ed->channels; } else { |