[Bf-blender-cvs] [d48f95d31c9] master: Cleanup: use vert_ prefix for positions of FaceDupliData_Mesh

Campbell Barton noreply at git.blender.org
Tue Jan 10 06:36:30 CET 2023


Commit: d48f95d31c939e0c3f2c186c3f2ce092b76f3ec9
Author: Campbell Barton
Date:   Tue Jan 10 16:34:39 2023 +1100
Branches: master
https://developer.blender.org/rBd48f95d31c939e0c3f2c186c3f2ce092b76f3ec9

Cleanup: use vert_ prefix for positions of FaceDupliData_Mesh

Match VertexDupliData_Mesh.

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

M	source/blender/blenkernel/intern/object_dupli.cc

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

diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc
index 2db9c2c31c1..a9f2406ccfd 100644
--- a/source/blender/blenkernel/intern/object_dupli.cc
+++ b/source/blender/blenkernel/intern/object_dupli.cc
@@ -1060,7 +1060,7 @@ struct FaceDupliData_Mesh {
   int totface;
   const MPoly *mpoly;
   const MLoop *mloop;
-  Span<float3> positions;
+  Span<float3> vert_positions;
   const float (*orco)[3];
   const MLoopUV *mloopuv;
 };
@@ -1159,14 +1159,14 @@ static DupliObject *face_dupli_from_mesh(const DupliContext *ctx,
                                          /* Mesh variables. */
                                          const MPoly *mpoly,
                                          const MLoop *mloopstart,
-                                         const Span<float3> positions)
+                                         const Span<float3> vert_positions)
 {
   const int coords_len = mpoly->totloop;
   Array<float3, 64> coords(coords_len);
 
   const MLoop *ml = mloopstart;
   for (int i = 0; i < coords_len; i++, ml++) {
-    coords[i] = positions[ml->v];
+    coords[i] = vert_positions[ml->v];
   }
 
   return face_dupli(ctx, inst_ob, child_imat, index, use_scale, scale_fac, coords);
@@ -1233,7 +1233,7 @@ static void make_child_duplis_faces_from_mesh(const DupliContext *ctx,
                                             scale_fac,
                                             mp,
                                             loopstart,
-                                            fdd->positions);
+                                            fdd->vert_positions);
 
     const float w = 1.0f / float(mp->totloop);
     if (orco) {
@@ -1322,7 +1322,7 @@ static void make_duplis_faces(const DupliContext *ctx)
     fdd.totface = me_eval->totpoly;
     fdd.mpoly = me_eval->polys().data();
     fdd.mloop = me_eval->loops().data();
-    fdd.positions = me_eval->vert_positions();
+    fdd.vert_positions = me_eval->vert_positions();
     fdd.mloopuv = (uv_idx != -1) ? (const MLoopUV *)CustomData_get_layer_n(
                                        &me_eval->ldata, CD_MLOOPUV, uv_idx) :
                                    nullptr;



More information about the Bf-blender-cvs mailing list