[Bf-blender-cvs] [899d2461bf8] master: Fix T68911: "illegal recursive expansion of macro id"

[mano-wii]

Commit: 899d2461bf84c9be25ae6c24675ba4a263542855
Author: mano-wii
Date:   Tue Aug 20 21:56:39 2019 -0300
Branches: master
https://developer.blender.org/rB899d2461bf84c9be25ae6c24675ba4a263542855

Fix T68911: "illegal recursive expansion of macro id"

I imagined that could be a problem for some drivers.
I should have avoided.

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

M       source/blender/draw/engines/select/shaders/selection_id_frag.glsl

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

diff --git a/source/blender/draw/engines/select/shaders/selection_id_frag.glsl 
b/source/blender/draw/engines/select/shaders/selection_id_frag.glsl
index ea86ddc7301..a84bbbb2cac 100644
--- a/source/blender/draw/engines/select/shaders/selection_id_frag.glsl
+++ b/source/blender/draw/engines/select/shaders/selection_id_frag.glsl
@@ -1,14 +1,15 @@
 
 #ifdef UNIFORM_ID
 uniform int id;
-#  define id floatBitsToUint(intBitsToFloat(id))
+#  define _id floatBitsToUint(intBitsToFloat(id))
 #else
 flat in uint id;
+#  define _id id
 #endif
 
 out uint fragColor;
 
 void main()
 {
-  fragColor = id;
+  fragColor = _id;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs