[Bf-blender-cvs] [cb747302dc9] blender2.8: Correct previous commit

Sergey Sharybin noreply at git.blender.org
Wed May 9 16:38:51 CEST 2018


Commit: cb747302dc9d000efc8fda1a351cb98538b6ed21
Author: Sergey Sharybin
Date:   Wed May 9 16:38:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBcb747302dc9d000efc8fda1a351cb98538b6ed21

Correct previous commit

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

M	source/blender/draw/engines/eevee/eevee_materials.c

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

diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 8332c17268b..4d1ff243f18 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -1484,7 +1484,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sld
 				}
 				ParticleSettings *part = psys->part;
 				int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as;
-				if (draw_as != PART_DRAW_PATH || psys->pathcache == NULL || psys->childcache == NULL) {
+				if (draw_as != PART_DRAW_PATH || (psys->pathcache == NULL && psys->childcache == NULL)) {
 					continue;
 				}
 				struct Gwn_Batch *hair_geom = DRW_cache_particles_get_hair(psys, md);



More information about the Bf-blender-cvs mailing list