[Bf-blender-cvs] [5c20161f81c] blender2.8: Fix compilation error in the stick bones shader for some Intel gpus.

[mano-wii]

Commit: 5c20161f81c75a4139cb3c865955f53a9880f627
Author: mano-wii
Date:   Thu Sep 20 12:11:23 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB5c20161f81c75a4139cb3c865955f53a9880f627

Fix compilation error in the stick bones shader for some Intel gpus.

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

M	source/blender/draw/modes/shaders/armature_stick_vert.glsl

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

diff --git a/source/blender/draw/modes/shaders/armature_stick_vert.glsl b/source/blender/draw/modes/shaders/armature_stick_vert.glsl
index 3b6bb640b63..58fc48e608e 100644
--- a/source/blender/draw/modes/shaders/armature_stick_vert.glsl
+++ b/source/blender/draw/modes/shaders/armature_stick_vert.glsl
@@ -8,14 +8,14 @@ uniform vec2 viewportSize;
 in vec2 pos; /* bone aligned screen space */
 in uint flag;
 
-#define COL_WIRE (1u << 0u)
-#define COL_HEAD (1u << 1u)
-#define COL_TAIL (1u << 2u)
-#define COL_BONE (1u << 3u)
+#define COL_WIRE 1u /* (1 << 0) */
+#define COL_HEAD 2u /* (1 << 1) */
+#define COL_TAIL 4u /* (1 << 2) */
+#define COL_BONE 8u /* (1 << 3) */
 
-#define POS_HEAD (1u << 4u)
-#define POS_TAIL (1u << 5u) /* UNUSED */
-#define POS_BONE (1u << 6u)
+#define POS_HEAD 16u /* (1 << 4) */
+#define POS_TAIL 32u /* (1 << 5) */ /* UNUSED */
+#define POS_BONE 64u /* (1 << 6) */
 
 /* ---- Per instance Attribs ---- */
 in vec3 boneStart;
@@ -26,8 +26,8 @@ in vec4 headColor; /* alpha encode if we do head. If 0.0 we dont. */
 in vec4 tailColor; /* alpha encode if we do tail. If 0.0 we dont. */
 
 #define do_wire (wireColor.a > 0.0)
-#define is_head ((flag & POS_HEAD) != 0u)
-#define is_bone ((flag & POS_BONE) != 0u)
+#define is_head bool(flag & POS_HEAD)
+#define is_bone bool(flag & POS_BONE)
 
 noperspective out float colorFac;
 flat out vec4 finalWireColor;