[Bf-blender-cvs] [9f575ece39e] master: Fix T103307: Crash reading particle hair key.co
Hans Goudey
noreply at git.blender.org
Mon Dec 19 20:08:21 CET 2022
Commit: 9f575ece39e8abacb31ee830abcfc7d5830b94b1
Author: Hans Goudey
Date: Mon Dec 19 13:05:05 2022 -0600
Branches: master
https://developer.blender.org/rB9f575ece39e8abacb31ee830abcfc7d5830b94b1
Fix T103307: Crash reading particle hair key.co
05952aa94d33eeb504f accessed the vertex array when the mesh was null.
===================================================================
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 a56e7d28ef7..aef5aea5bac 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -212,8 +212,8 @@ static void rna_ParticleHairKey_location_object_get(PointerRNA *ptr, float *valu
if (pa) {
Mesh *hair_mesh = (psmd->psys->flag & PSYS_HAIR_DYNAMICS) ? psmd->psys->hair_out_mesh : NULL;
- const MVert *verts = BKE_mesh_verts(hair_mesh);
if (hair_mesh) {
+ const MVert *verts = BKE_mesh_verts(hair_mesh);
const MVert *mv = &verts[pa->hair_index + (hkey - pa->hair)];
copy_v3_v3(values, mv->co);
}
More information about the Bf-blender-cvs
mailing list