From 1dd92f352bc730a90591a9e728477f037a2a2886 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 13 Jul 2015 11:01:34 +0200 Subject: Fix T45385: Crash on render occurring when two hair modifiers are active that both use a UV mapped material for render Not sure it's totally correct solution, but seems reasonable because it's possible dmcache is set to ISCHILD. Someone more familiar with the particles code might want to revisit this :) --- 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 1da1a81fe95..9392baeb1ca 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1250,7 +1250,7 @@ static void get_particle_uvco_mcol(short from, DerivedMesh *dm, float *fuv, int /* get uvco */ if (sd->uvco && ELEM(from, PART_FROM_FACE, PART_FROM_VOLUME)) { for (i=0; itotuv; i++) { - if (num != DMCACHE_NOTFOUND) { + if (!ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) { MFace *mface = dm->getTessFaceData(dm, num, CD_MFACE); MTFace *mtface = (MTFace*)CustomData_get_layer_n(&dm->faceData, CD_MTFACE, i); mtface += num; -- cgit v1.2.3