diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-23 05:30:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-23 06:26:33 +0300 |
| commit | 0093ad643a6d5d59e054843df9e1079206959ec4 (patch) | |
| tree | e3d3cd8dbc8f9583af3da42e4ba37dcb788f5fd5 /source/blender/draw/engines/workbench/workbench_deferred.c | |
| parent | 045a615f9a4c1f52b336497e99eb449f92e9dfb2 (diff) | |
Cleanp: remove redundant clipping uniform
workbench_material_shgroup_uniform handles this.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_deferred.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_deferred.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c index b23c01d9a5f..9a1cd704b87 100644 --- a/source/blender/draw/engines/workbench/workbench_deferred.c +++ b/source/blender/draw/engines/workbench/workbench_deferred.c @@ -436,8 +436,8 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata) "#define ALPHA_COMPOSITE\n"); } - workbench_forward_choose_shaders(wpd); - workbench_forward_outline_shaders_ensure(wpd); + workbench_forward_choose_shaders(wpd, draw_ctx->sh_cfg); + workbench_forward_outline_shaders_ensure(wpd, draw_ctx->sh_cfg); } { @@ -824,11 +824,6 @@ static WORKBENCH_MaterialData *get_or_create_material_data( DRW_shgroup_stencil_mask(material->shgrp, (ob->dtx & OB_DRAWXRAY) ? 0x00 : 0xFF); DRW_shgroup_uniform_int(material->shgrp, "object_id", &material->object_id, 1); workbench_material_shgroup_uniform(wpd, material->shgrp, material, ob, true, true, interp); - if (WORLD_CLIPPING_ENABLED(wpd)) { - const DRWContextState *draw_ctx = DRW_context_state_get(); - RegionView3D *rv3d = draw_ctx->rv3d; - DRW_shgroup_world_clip_planes_from_rv3d(material->shgrp, rv3d); - } BLI_ghash_insert(wpd->material_hash, POINTER_FROM_UINT(hash), material); } return material; |