Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormano-wii <germano.costa@ig.com.br>2019-08-21 03:56:39 +0300
committermano-wii <germano.costa@ig.com.br>2019-08-21 03:56:39 +0300
commit899d2461bf84c9be25ae6c24675ba4a263542855 (patch)
treece181252bcaefb6972caaa2a2ced30fe92675890 /source/blender/draw/engines/select
parentdaba3e871ff572ff44e82e67084e32653a8559f4 (diff)
Fix T68911: "illegal recursive expansion of macro id"
I imagined that could be a problem for some drivers. I should have avoided.
Diffstat (limited to 'source/blender/draw/engines/select')
-rw-r--r--source/blender/draw/engines/select/shaders/selection_id_frag.glsl5
1 files changed, 3 insertions, 2 deletions
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;
}