Commit: a9be42dfa284be0742de2719ea90671612240705
Author: Lukas Toenne
Date: Sun Jul 15 12:16:27 2018 +0100
Branches: hair_guides hair_guides_grooming tmp_hair_curves
https://developer.blender.org/rBa9be42dfa284be0742de2719ea90671612240705
Merge branch 'blender2.8' into hair_guides
===================================================================
===================================================================
diff --cc source/blender/draw/engines/eevee/eevee_materials.c
index 80c06e9783d,20d755d2245..011457c8243
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@@ -829,15 -803,14 +832,16 @@@ struct GPUMaterial *EEVEE_material_mesh
}
struct GPUMaterial *EEVEE_material_hair_get(
- struct Scene *scene, Material *ma, int shadow_method)
+ struct Scene *scene, Material *ma, int shadow_method, bool use_fibers)
{
const void *engine = &DRW_engine_viewport_eevee_type;
- int options = VAR_MAT_MESH | VAR_MAT_HAIR;
-
+ int options = VAR_MAT_HAIR | VAR_MAT_MESH;
options |= eevee_material_shadow_option(shadow_method);
-
+ if (use_fibers) {
+ options |= VAR_MAT_HAIR_FIBERS;
+ }
- GPUMaterial *mat = DRW_shader_find_from_material(ma, engine, options);
+ GPUMaterial *mat = DRW_shader_find_from_material(ma, engine, options,
true);
++
if (mat) {
return mat;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
