From afa8a0ac19f28c103171c010929470a2a167c976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Mon, 9 Mar 2015 18:32:34 +0100 Subject: Fix for yet another assert fail of particle dmcache index. This is totally broken, just making sure Blender does not crash and devs can investigate other issues that are actually fixable. --- source/blender/render/intern/source/convertblender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 01a347e37c7..2ebcb76e3d1 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1258,7 +1258,7 @@ static void get_particle_uvco_mcol(short from, DerivedMesh *dm, float *fuv, int /* get mcol */ if (sd->mcol && ELEM(from, PART_FROM_FACE, PART_FROM_VOLUME)) { for (i=0; itotcol; i++) { - if (num != DMCACHE_NOTFOUND) { + if (!ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) { MFace *mface = dm->getTessFaceData(dm, num, CD_MFACE); MCol *mc = (MCol*)CustomData_get_layer_n(&dm->faceData, CD_MCOL, i); mc += num * 4; -- cgit v1.2.3