Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2022-09-02 21:30:50 +0300
committerClément Foucault <foucault.clem@gmail.com>2022-09-02 21:34:37 +0300
commit9c469321c57872789c56eb7439c9c5cd34e3d473 (patch)
tree85bfcc951c1b30577ebfcde2c31c998df4f4c19d /source/blender
parentccf62df8b61080e0f5281ef1a4ebb4f6039363d5 (diff)
Cleanup: Fix clang-tidy warnings: [readability-else-after-return]
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c6
-rw-r--r--source/blender/render/intern/engine.cc14
2 files changed, 8 insertions, 12 deletions
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 5bca49f632c..bf17e53c2ce 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -5244,11 +5244,11 @@ static void lineart_gpencil_generate(LineartCache *cache,
(!(ec->shadow_mask_bits & LRT_SHADOW_MASK_ILLUMINATED)))) {
continue;
}
- else if ((shaodow_selection == LRT_SHADOW_FILTER_SHADED &&
- (!(ec->shadow_mask_bits & LRT_SHADOW_MASK_SHADED)))) {
+ if ((shaodow_selection == LRT_SHADOW_FILTER_SHADED &&
+ (!(ec->shadow_mask_bits & LRT_SHADOW_MASK_SHADED)))) {
continue;
}
- else if (shaodow_selection == LRT_SHADOW_FILTER_ILLUMINATED_ENCLOSED_SHAPES) {
+ if (shaodow_selection == LRT_SHADOW_FILTER_ILLUMINATED_ENCLOSED_SHAPES) {
uint32_t test_bits = ec->shadow_mask_bits & LRT_SHADOW_TEST_SHAPE_BITS;
if ((test_bits != LRT_SHADOW_MASK_ILLUMINATED) &&
(test_bits != (LRT_SHADOW_MASK_SHADED | LRT_SHADOW_MASK_ILLUMINATED_SHAPE))) {
diff --git a/source/blender/render/intern/engine.cc b/source/blender/render/intern/engine.cc
index 792ad655b68..a440b34af78 100644
--- a/source/blender/render/intern/engine.cc
+++ b/source/blender/render/intern/engine.cc
@@ -1292,16 +1292,12 @@ bool RE_engine_gpu_context_enable(RenderEngine *engine)
DRW_render_context_enable(engine->re);
return true;
}
- else {
- if (engine->gpu_context) {
- BLI_mutex_lock(&engine->gpu_context_mutex);
- WM_opengl_context_activate(engine->gpu_context);
- return true;
- }
- else {
- return false;
- }
+ if (engine->gpu_context) {
+ BLI_mutex_lock(&engine->gpu_context_mutex);
+ WM_opengl_context_activate(engine->gpu_context);
+ return true;
}
+ return false;
}
void RE_engine_gpu_context_disable(RenderEngine *engine)