[Bf-blender-cvs] [0122615d36d] blender-v2.83-release: Workbench: Fix broken id pass

[Clément Foucault]

Commit: 0122615d36d505eff4be548dbc15c25d184514ab
Author: Clément Foucault
Date:   Wed Aug 5 19:35:34 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB0122615d36d505eff4be548dbc15c25d184514ab

Workbench: Fix broken id pass

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

M	source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl
M	source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl

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

diff --git a/source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl
index 6a7bc185fe9..3e1ea14f47c 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl
@@ -90,5 +90,5 @@ void main()
   packed_rough_metal = workbench_float_pair_encode(roughness, metallic);
 #endif
 
-  object_id = int((uint(resource_id) + 1u) & 0xFFu);
+  object_id = int(uint(resource_handle) & 0xFFFFu) + 1;
 }
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl
index 31e298d1540..1192081caf1 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl
@@ -36,5 +36,5 @@ void main()
   packed_rough_metal = workbench_float_pair_encode(roughness, metallic);
 #endif
 
-  object_id = int((uint(resource_id) + 1u) & 0xFFu);
+  object_id = int(uint(resource_handle) & 0xFFFFu) + 1;
 }