[Bf-blender-cvs] [526392ab163] blender2.8: Workbench: Remove warning

[Jeroen Bakker]

Commit: 526392ab1637c1c11ebea44c7409bd2bd12e8a5c
Author: Jeroen Bakker
Date:   Thu Jun 21 15:15:41 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB526392ab1637c1c11ebea44c7409bd2bd12e8a5c

Workbench: Remove warning

When in forward rendering and Object outline was disabled every render
call created one console warning (uniform objectId not found)

this commit removes this warning

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

M	source/blender/draw/engines/workbench/workbench_forward.c

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

diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c
index 6a4737ab8b9..47fcaa0ca66 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -334,7 +334,9 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata)
 		psl->composite_pass = DRW_pass_create("Composite", state);
 
 		grp = DRW_shgroup_create(wpd->composite_sh, psl->composite_pass);
-		DRW_shgroup_uniform_texture_ref(grp, "objectId", &e_data.object_id_tx);
+		if (OBJECT_ID_PASS_ENABLED(wpd)) {
+			DRW_shgroup_uniform_texture_ref(grp, "objectId", &e_data.object_id_tx);
+		}
 		DRW_shgroup_uniform_texture_ref(grp, "transparentAccum", &e_data.transparent_accum_tx);
 		DRW_shgroup_uniform_texture_ref(grp, "transparentRevealage", &e_data.transparent_revealage_tx);
 		DRW_shgroup_uniform_block(grp, "world_block", wpd->world_ubo);