Commit: 27b28e437d974ebbafa234205941c07aa0ab546c
Author: Lukas Tönne
Date: Sun Aug 12 11:05:36 2018 +0100
Branches: hair_guides hair_guides_grooming
https://developer.blender.org/rB27b28e437d974ebbafa234205941c07aa0ab546c
Merge branch 'tmp_hair_curves' into hair_guides
===================================================================
===================================================================
diff --cc source/blender/draw/engines/workbench/workbench_forward.c
index af5ba3dc357,2e3e9341f1b..3cc04d7936a
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@@ -271,10 -262,10 +262,9 @@@ void workbench_forward_engine_init(WORK
memset(e_data.composite_sh_cache, 0x00, sizeof(struct GPUShader
*) * MAX_SHADERS);
memset(e_data.transparent_accum_sh_cache, 0x00, sizeof(struct
GPUShader *) * MAX_SHADERS);
- char *defines = workbench_material_build_defines(wpd, false,
DRW_SHADER_HAIR_NONE);
- char *defines_texture = workbench_material_build_defines(wpd,
true, DRW_SHADER_HAIR_NONE);
- char *defines_hair = workbench_material_build_defines(wpd,
false, DRW_SHADER_HAIR_PARTICLES);
- char *defines_hair_fibers =
workbench_material_build_defines(wpd, false, DRW_SHADER_HAIR_FIBERS);
+ char *defines = workbench_material_build_defines(wpd, false,
false);
+ char *defines_texture = workbench_material_build_defines(wpd,
true, false);
+ char *defines_hair = workbench_material_build_defines(wpd,
false, true);
- char *defines_hair_fibers =
workbench_material_build_defines(wpd, false, true);
char *forward_vert = workbench_build_forward_vert();
e_data.object_outline_sh = DRW_shader_create(
forward_vert, NULL,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
