diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-01-14 20:48:21 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-01-15 01:43:17 +0300 |
| commit | 21fedfbca0219781e7c17bcd7be84f6a3746e4e9 (patch) | |
| tree | fbac7630eedb535b777d8bc6a5646a90881cdb55 /source/blender/draw/intern/draw_hair.c | |
| parent | 84c06e996a7af0aea8d672897f270a1ad57ac2a2 (diff) | |
Fix T59482: Creating 2 Particle systems breaks the app
Diffstat (limited to 'source/blender/draw/intern/draw_hair.c')
| -rw-r--r-- | source/blender/draw/intern/draw_hair.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |