From 3c426feb127271994ad4de7178dc166831f30b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 16 Jan 2020 14:52:01 +0100 Subject: [PATCH] Fix T73121: Blender crashes on accessing particle uv_on_emitter Blender wasn't checking whether the passed modifier actually contained an evaluated mesh, before accessing the mesh pointer. --- source/blender/makesrna/intern/rna_particle.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 4da42eb6bba..0ed9678ae06 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -286,6 +286,11 @@ static void rna_Particle_uv_on_emitter(ParticleData *particle, psmd, part->from, pa->num, pa->num_dmcache, pa->fuv, pa->foffset, co, nor, 0, 0, sd.orco, 0); # endif + if (modifier->mesh_final == NULL) { + BKE_report(reports, RPT_ERROR, "uv_on_emitter() requires a modifier from an evaluated object"); + return; + } + /* get uvco & mcol */ int num = particle->num_dmcache; int from = modifier->psys->part->from;