[Bf-blender-cvs] [3c426feb127] blender-v2.82-release: Fix T73121: Blender crashes on accessing particle uv_on_emitter

Sybren A. Stüvel noreply at git.blender.org
Thu Jan 16 14:59:46 CET 2020


Commit: 3c426feb127271994ad4de7178dc166831f30b00
Author: Sybren A. Stüvel
Date:   Thu Jan 16 14:52:01 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB3c426feb127271994ad4de7178dc166831f30b00

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.

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

M	source/blender/makesrna/intern/rna_particle.c

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

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;



More information about the Bf-blender-cvs mailing list