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:
authorCampbell Barton <ideasman42@gmail.com>2019-03-23 06:25:29 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-23 06:30:38 +0300
commit7454fa927b80118bb54a70d4c98100ff0187953f (patch)
tree2cb5ae3fe0d1d93dee440c5fc8904afd31f6d330 /source/blender/draw/engines/workbench/workbench_materials.c
parent0093ad643a6d5d59e054843df9e1079206959ec4 (diff)
Fix workbench object outline ignoring clipping
Workbench forward engine wasn't recompiling shaders when clipping changed, use GPUShaderConfigData when creating shaders.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_materials.c')
-rw-r--r--source/blender/draw/engines/workbench/workbench_materials.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c
index df0b57ba34a..8ddcbd2e283 100644
--- a/source/blender/draw/engines/workbench/workbench_materials.c
+++ b/source/blender/draw/engines/workbench/workbench_materials.c
@@ -130,9 +130,6 @@ char *workbench_material_build_defines(WORKBENCH_PrivateData *wpd, bool use_text
if (is_hair) {
BLI_dynstr_appendf(ds, "#define HAIR_SHADER\n");
}
- if (WORLD_CLIPPING_ENABLED(wpd)) {
- BLI_dynstr_appendf(ds, "#define USE_WORLD_CLIP_PLANES\n");
- }
str = BLI_dynstr_get_cstring(ds);
BLI_dynstr_free(ds);
@@ -192,7 +189,6 @@ int workbench_material_get_prepass_shader_index(
SET_FLAG_FROM_TEST(index, NORMAL_VIEWPORT_PASS_ENABLED(wpd), 1 << 3);
SET_FLAG_FROM_TEST(index, MATCAP_ENABLED(wpd), 1 << 4);
SET_FLAG_FROM_TEST(index, use_textures, 1 << 5);
- SET_FLAG_FROM_TEST(index, WORLD_CLIPPING_ENABLED(wpd), 1 << 6);
BLI_assert(index < MAX_PREPASS_SHADERS);
return index;
}