From c889d93c80c52603a501b6b76f6e251b7a6112d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Fri, 7 Aug 2020 12:39:35 +0200
Subject: Cleanup: GPU, Clang-Tidy else-after-return fixes

This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/gpu` module.

No functional changes.
---
 source/blender/gpu/intern/gpu_codegen.c | 40 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 21 deletions(-)

(limited to 'source/blender/gpu/intern/gpu_codegen.c')

diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c
index 8947365d666..08d2779043e 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -220,63 +220,61 @@ static const char *gpu_builtin_name(eGPUBuiltin builtin)
   if (builtin == GPU_VIEW_MATRIX) {
     return "unfviewmat";
   }
-  else if (builtin == GPU_OBJECT_MATRIX) {
+  if (builtin == GPU_OBJECT_MATRIX) {
     return "unfobmat";
   }
-  else if (builtin == GPU_INVERSE_VIEW_MATRIX) {
+  if (builtin == GPU_INVERSE_VIEW_MATRIX) {
     return "unfinvviewmat";
   }
-  else if (builtin == GPU_INVERSE_OBJECT_MATRIX) {
+  if (builtin == GPU_INVERSE_OBJECT_MATRIX) {
     return "unfinvobmat";
   }
-  else if (builtin == GPU_LOC_TO_VIEW_MATRIX) {
+  if (builtin == GPU_LOC_TO_VIEW_MATRIX) {
     return "unflocaltoviewmat";
   }
-  else if (builtin == GPU_INVERSE_LOC_TO_VIEW_MATRIX) {
+  if (builtin == GPU_INVERSE_LOC_TO_VIEW_MATRIX) {
     return "unfinvlocaltoviewmat";
   }
-  else if (builtin == GPU_VIEW_POSITION) {
+  if (builtin == GPU_VIEW_POSITION) {
     return "varposition";
   }
-  else if (builtin == GPU_WORLD_NORMAL) {
+  if (builtin == GPU_WORLD_NORMAL) {
     return "varwnormal";
   }
-  else if (builtin == GPU_VIEW_NORMAL) {
+  if (builtin == GPU_VIEW_NORMAL) {
     return "varnormal";
   }
-  else if (builtin == GPU_OBJECT_COLOR) {
+  if (builtin == GPU_OBJECT_COLOR) {
     return "unfobjectcolor";
   }
-  else if (builtin == GPU_AUTO_BUMPSCALE) {
+  if (builtin == GPU_AUTO_BUMPSCALE) {
     return "unfobautobumpscale";
   }
-  else if (builtin == GPU_CAMERA_TEXCO_FACTORS) {
+  if (builtin == GPU_CAMERA_TEXCO_FACTORS) {
     return "unfcameratexfactors";
   }
-  else if (builtin == GPU_PARTICLE_SCALAR_PROPS) {
+  if (builtin == GPU_PARTICLE_SCALAR_PROPS) {
     return "unfparticlescalarprops";
   }
-  else if (builtin == GPU_PARTICLE_LOCATION) {
+  if (builtin == GPU_PARTICLE_LOCATION) {
     return "unfparticleco";
   }
-  else if (builtin == GPU_PARTICLE_VELOCITY) {
+  if (builtin == GPU_PARTICLE_VELOCITY) {
     return "unfparticlevel";
   }
-  else if (builtin == GPU_PARTICLE_ANG_VELOCITY) {
+  if (builtin == GPU_PARTICLE_ANG_VELOCITY) {
     return "unfparticleangvel";
   }
-  else if (builtin == GPU_OBJECT_INFO) {
+  if (builtin == GPU_OBJECT_INFO) {
     return "unfobjectinfo";
   }
-  else if (builtin == GPU_BARYCENTRIC_TEXCO) {
+  if (builtin == GPU_BARYCENTRIC_TEXCO) {
     return "unfbarycentrictex";
   }
-  else if (builtin == GPU_BARYCENTRIC_DIST) {
+  if (builtin == GPU_BARYCENTRIC_DIST) {
     return "unfbarycentricdist";
   }
-  else {
-    return "";
-  }
+  return "";
 }
 
 static void codegen_set_unique_ids(GPUNodeGraph *graph)
-- 
cgit v1.2.3