diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-26 21:34:07 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-26 21:34:07 +0400 |
| commit | cc6b106d345bb15506a6a43be49066d48a8ebc8b (patch) | |
| tree | ea607fbdd8f8b48b7dbe0f1a11adbd6d004cba78 /source/blender/blenkernel/intern/particle.c | |
| parent | 8da4936590e6390bf401472f632928111f0b41da (diff) | |
Fix T39432: yet another particle bug caused by inconsistent num_dmcache
mystery.
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 2c7d58586cf..fbad836f922 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -3779,7 +3779,7 @@ static int get_particle_uv(DerivedMesh *dm, ParticleData *pa, int face_index, co return 0; if (pa) { - i = (pa->num_dmcache == DMCACHE_NOTFOUND) ? pa->num : pa->num_dmcache; + i = ELEM(pa->num_dmcache, DMCACHE_NOTFOUND, DMCACHE_ISCHILD) ? pa->num : pa->num_dmcache; if (i >= dm->getNumTessFaces(dm)) i = -1; } |