[Bf-blender-cvs] [21fedfbca02] master: Fix T59482: Creating 2 Particle systems breaks the app

[Clément Foucault]

Commit: 21fedfbca0219781e7c17bcd7be84f6a3746e4e9
Author: Clément Foucault
Date:   Mon Jan 14 18:48:21 2019 +0100
Branches: master
https://developer.blender.org/rB21fedfbca0219781e7c17bcd7be84f6a3746e4e9

Fix T59482: Creating 2 Particle systems breaks the app

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

M	source/blender/draw/intern/draw_hair.c

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

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);