From 899d2461bf84c9be25ae6c24675ba4a263542855 Mon Sep 17 00:00:00 2001 From: mano-wii Date: Tue, 20 Aug 2019 21:56:39 -0300 Subject: Fix T68911: "illegal recursive expansion of macro id" I imagined that could be a problem for some drivers. I should have avoided. --- source/blender/draw/engines/select/shaders/selection_id_frag.glsl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '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; } -- cgit v1.2.3