diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-05-21 21:06:48 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-05-21 21:07:53 +0400 |
| commit | 79fe023ec6a405a5de7bf30195b7ea94938e8a99 (patch) | |
| tree | be7621030f6c14731fada7cf014a06b8b0507e73 /source/blender/blenkernel/intern/particle.c | |
| parent | d88e9fb3389309869389aa059f6be65f13230a7a (diff) | |
Fix T40299, Crash on rendering due to dependency cycles and NULL pointer when using particle duplis.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index eb657bac312..e5efffa5d0e 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -1907,7 +1907,7 @@ void psys_particle_on_emitter(ParticleSystemModifierData *psmd, int from, int in float fuv[4], float foffset, float vec[3], float nor[3], float utan[3], float vtan[3], float orco[3], float ornor[3]) { - if (psmd) { + if (psmd && psmd->dm) { if (psmd->psys->part->distr == PART_DISTR_GRID && psmd->psys->part->from != PART_FROM_VERT) { if (vec) copy_v3_v3(vec, fuv); |