[Bf-blender-cvs] [cc6b106] master: Fix T39432: yet another particle bug caused by inconsistent num_dmcache mystery.

[Lukas Tönne]

Commit: cc6b106d345bb15506a6a43be49066d48a8ebc8b
Author: Lukas Tönne
Date:   Wed Mar 26 18:34:07 2014 +0100
https://developer.blender.org/rBcc6b106d345bb15506a6a43be49066d48a8ebc8b

Fix T39432: yet another particle bug caused by inconsistent num_dmcache
mystery.

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

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

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

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 2c7d585..fbad836 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;
 	}