[Bf-blender-cvs] [3d195d07636] hair_guides_grooming: Add groom object type to Eevee cache population check.

Lukas Tönne noreply at git.blender.org
Sun May 27 08:43:14 CEST 2018


Commit: 3d195d076369b917eece8b73792bbd0d1f67c23a
Author: Lukas Tönne
Date:   Sun May 27 07:02:47 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rB3d195d076369b917eece8b73792bbd0d1f67c23a

Add groom object type to Eevee cache population check.

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

M	source/blender/draw/engines/eevee/eevee_engine.c
M	source/blender/draw/engines/eevee/eevee_render.c

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

diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c
index 8448393aa97..4e7b6c5a5d3 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -139,7 +139,7 @@ static void eevee_cache_populate(void *vedata, Object *ob)
 		return;
 	}
 
-	if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT)) {
+	if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_GROOM)) {
 		bool cast_shadow;
 
 		EEVEE_materials_cache_populate(vedata, sldata, ob, &cast_shadow);
diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c
index 2d3cb440c7c..ddc4841c0f5 100644
--- a/source/blender/draw/engines/eevee/eevee_render.c
+++ b/source/blender/draw/engines/eevee/eevee_render.c
@@ -148,7 +148,7 @@ void EEVEE_render_cache(
 		return;
 	}
 
-	if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT)) {
+	if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_GROOM)) {
 		bool cast_shadow;
 
 		EEVEE_materials_cache_populate(vedata, sldata, ob, &cast_shadow);



More information about the Bf-blender-cvs mailing list