[Bf-blender-cvs] [31f371b2005] tmp_hair_curves: Merge branch 'hair_guides' into tmp_hair_curves

[Lukas Toenne]

Commit: 31f371b2005acdf8116c850c328c73b2cf7ce977
Author: Lukas Toenne
Date:   Sun Jul 15 12:28:34 2018 +0100
Branches: tmp_hair_curves
https://developer.blender.org/rB31f371b2005acdf8116c850c328c73b2cf7ce977

Merge branch 'hair_guides' into tmp_hair_curves

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



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

diff --cc source/blender/draw/engines/eevee/eevee_materials.c
index 73593a53f97,011457c8243..4554aeb45ea
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@@ -802,14 -832,16 +805,15 @@@ struct GPUMaterial *EEVEE_material_mesh
  }
  
  struct GPUMaterial *EEVEE_material_hair_get(
 -        struct Scene *scene, Material *ma, int shadow_method, bool use_fibers)
 +        struct Scene *scene, Material *ma, int shadow_method)
  {
  	const void *engine = &DRW_engine_viewport_eevee_type;
 -	int options = VAR_MAT_HAIR | VAR_MAT_MESH;
 +	int options = VAR_MAT_MESH | VAR_MAT_HAIR;
 +
  	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;
  	}