diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-10 09:46:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-10 09:46:45 +0400 |
| commit | e6291ea41847598fa083fe1acceb287cae62a728 (patch) | |
| tree | 8e3213c279d53bd8034a6e759d376004ecde45e6 /source/blender/blenkernel/intern/particle.c | |
| parent | 06be19c0ec854966adffae404966c821b8ff94b3 (diff) | |
fix [#36079] Use Modifier Stack Crash with Particles
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index f6901c7b81b..b3f29fe8ce1 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -3414,8 +3414,7 @@ static void psys_face_mat(Object *ob, DerivedMesh *dm, ParticleData *pa, float m OrigSpaceFace *osface; float (*orcodata)[3]; - int i = pa->num_dmcache == DMCACHE_NOTFOUND ? pa->num : pa->num_dmcache; - + int i = (ELEM(pa->num_dmcache, DMCACHE_ISCHILD, DMCACHE_NOTFOUND)) ? pa->num : pa->num_dmcache; if (i == -1 || i >= dm->getNumTessFaces(dm)) { unit_m4(mat); return; } mface = dm->getTessFaceData(dm, i, CD_MFACE); |