Revert "DRW: Refactor to support draw call batching"

This reverts commit ce34a6b0d727bbde6ae373afa8ec6c42bc8980ce.

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/draw/engines/workbench/shaders/workbench_forward_depth_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_forward_depth_frag.glsl
index abd8c1f6579..505b4822ad6 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_forward_depth_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_forward_depth_frag.glsl
@@ -1,6 +1,5 @@
-
+uniform int object_id = 0;
 layout(location = 0) out uint objectId;
-
 uniform float ImageTransparencyCutoff = 0.1;
 #ifdef V3D_SHADING_TEXTURE_COLOR
 uniform sampler2D image;
@@ -11,10 +10,11 @@ in vec2 uv_interp;
 void main()
 {
 #ifdef V3D_SHADING_TEXTURE_COLOR
-  if (texture(image, uv_interp).a < ImageTransparencyCutoff) {
+  vec4 diffuse_color = texture(image, uv_interp);
+  if (diffuse_color.a < ImageTransparencyCutoff) {
     discard;
   }
 #endif
 
-  objectId = uint(resource_id + 1) & 0xFFu;
+  objectId = uint(object_id);
 }