From 21fedfbca0219781e7c17bcd7be84f6a3746e4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Mon, 14 Jan 2019 18:48:21 +0100 Subject: [PATCH] Fix T59482: Creating 2 Particle systems breaks the app --- source/blender/draw/intern/draw_hair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/draw/intern/draw_hair.c b/source/blender/draw/intern/draw_hair.c index f6891563dbb..7c83f28f995 100644 --- a/source/blender/draw/intern/draw_hair.c +++ b/source/blender/draw/intern/draw_hair.c @@ -141,7 +141,7 @@ static DRWShadingGroup *drw_shgroup_create_hair_procedural_ex( } } - if (dupli_parent) { + if ((dupli_parent != NULL) && (dupli_object != NULL)) { DRWHairInstanceData *hair_inst_data = (DRWHairInstanceData *)DRW_drawdata_ensure( &object->id, (DrawEngineType *)&drw_shgroup_create_hair_procedural_ex, sizeof(DRWHairInstanceData), NULL, NULL);