[Bf-blender-cvs] [79fe023] master: Fix T40299, Crash on rendering due to dependency cycles and NULL pointer when using particle duplis.

[Lukas Tönne]

Commit: 79fe023ec6a405a5de7bf30195b7ea94938e8a99
Author: Lukas Tönne
Date:   Wed May 21 19:06:48 2014 +0200
https://developer.blender.org/rB79fe023ec6a405a5de7bf30195b7ea94938e8a99

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

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

M       source/blender/blenkernel/intern/particle.c

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

diff --git a/source/blender/blenkernel/intern/particle.c 
b/source/blender/blenkernel/intern/particle.c
index eb657ba..e5efffa 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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs