Fix T40299, Crash on rendering due to dependency cycles and NULL pointer when using particle duplis.

This commit is contained in:
Lukas Tönne
2014-05-21 19:06:48 +02:00
parent d88e9fb338
commit 79fe023ec6

View File

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