[Bf-blender-cvs] [bd31b1f182c] blender2.8: Clay: Use switch statement instead of if-else chain

[Sergey Sharybin]

Commit: bd31b1f182c946f98478d6de8db890e158bc62ec
Author: Sergey Sharybin
Date:   Fri May 12 15:47:08 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBbd31b1f182c946f98478d6de8db890e158bc62ec

Clay: Use switch statement instead of if-else chain

===================================================================

M	source/blender/draw/engines/clay/clay_engine.c

===================================================================

diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c
index 1941c339c96..a405f26ea8e 100644
--- a/source/blender/draw/engines/clay/clay_engine.c
+++ b/source/blender/draw/engines/clay/clay_engine.c
@@ -186,29 +186,33 @@ static struct GPUTexture *load_matcaps(PreviewImage *prv[24], int nbr)
 
 static int matcap_to_index(int matcap)
 {
-	if (matcap == ICON_MATCAP_02) return 1;
-	else if (matcap == ICON_MATCAP_03) return 2;
-	else if (matcap == ICON_MATCAP_04) return 3;
-	else if (matcap == ICON_MATCAP_05) return 4;
-	else if (matcap == ICON_MATCAP_06) return 5;
-	else if (matcap == ICON_MATCAP_07) return 6;
-	else if (matcap == ICON_MATCAP_08) return 7;
-	else if (matcap == ICON_MATCAP_09) return 8;
-	else if (matcap == ICON_MATCAP_10) return 9;
-	else if (matcap == ICON_MATCAP_11) return 10;
-	else if (matcap == ICON_MATCAP_12) return 11;
-	else if (matcap == ICON_MATCAP_13) return 12;
-	else if (matcap == ICON_MATCAP_14) return 13;
-	else if (matcap == ICON_MATCAP_15) return 14;
-	else if (matcap == ICON_MATCAP_16) return 15;
-	else if (matcap == ICON_MATCAP_17) return 16;
-	else if (matcap == ICON_MATCAP_18) return 17;
-	else if (matcap == ICON_MATCAP_19) return 18;
-	else if (matcap == ICON_MATCAP_20) return 19;
-	else if (matcap == ICON_MATCAP_21) return 20;
-	else if (matcap == ICON_MATCAP_22) return 21;
-	else if (matcap == ICON_MATCAP_23) return 22;
-	else if (matcap == ICON_MATCAP_24) return 23;
+	switch (matcap) {
+		case ICON_MATCAP_01: return 0;
+		case ICON_MATCAP_02: return 1;
+		case ICON_MATCAP_03: return 2;
+		case ICON_MATCAP_04: return 3;
+		case ICON_MATCAP_05: return 4;
+		case ICON_MATCAP_06: return 5;
+		case ICON_MATCAP_07: return 6;
+		case ICON_MATCAP_08: return 7;
+		case ICON_MATCAP_09: return 8;
+		case ICON_MATCAP_10: return 9;
+		case ICON_MATCAP_11: return 10;
+		case ICON_MATCAP_12: return 11;
+		case ICON_MATCAP_13: return 12;
+		case ICON_MATCAP_14: return 13;
+		case ICON_MATCAP_15: return 14;
+		case ICON_MATCAP_16: return 15;
+		case ICON_MATCAP_17: return 16;
+		case ICON_MATCAP_18: return 17;
+		case ICON_MATCAP_19: return 18;
+		case ICON_MATCAP_20: return 19;
+		case ICON_MATCAP_21: return 20;
+		case ICON_MATCAP_22: return 21;
+		case ICON_MATCAP_23: return 22;
+		case ICON_MATCAP_24: return 23;
+	}
+	BLI_assert(!"Should not happen");
 	return 0;
 }