[Bf-blender-cvs] [63e5276ccd4] refactor-mesh-position-generic: Merge branch 'master' into refactor-mesh-position-generic

[Hans Goudey]

Commit: 63e5276ccd4ed3636b68f830a9cc9ff5e04cf7d9
Author: Hans Goudey
Date:   Mon Dec 19 23:25:35 2022 -0600
Branches: refactor-mesh-position-generic
https://developer.blender.org/rB63e5276ccd4ed3636b68f830a9cc9ff5e04cf7d9

Merge branch 'master' into refactor-mesh-position-generic

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



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

diff --cc source/blender/makesrna/intern/rna_particle.c
index 17433ffc23e,aef5aea5bac..d6b9b4ad231
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@@ -212,9 -212,10 +212,9 @@@ static void rna_ParticleHairKey_locatio
  
    if (pa) {
      Mesh *hair_mesh = (psmd->psys->flag & PSYS_HAIR_DYNAMICS) ? psmd->psys->hair_out_mesh : NULL;
-     const float(*positions)[3] = BKE_mesh_positions(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);
++      const float(*positions)[3] = BKE_mesh_positions(hair_mesh);
 +      copy_v3_v3(values, positions[pa->hair_index + (hkey - pa->hair)]);
      }
      else {
        float hairmat[4][4];