[Bf-blender-cvs] [d7a131ed304] refactor-mesh-remove-pointers: Fix retrieval of MFace data from poly custom data

[Hans Goudey]

Commit: d7a131ed304ede3aa7d878866d7232c7fdb5a590
Author: Hans Goudey
Date:   Wed Aug 31 22:33:51 2022 -0500
Branches: refactor-mesh-remove-pointers
https://developer.blender.org/rBd7a131ed304ede3aa7d878866d7232c7fdb5a590

Fix retrieval of MFace data from poly custom data

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

M       source/blender/draw/intern/draw_cache_impl_particles.c

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

diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c 
b/source/blender/draw/intern/draw_cache_impl_particles.c
index 5edbe671e4a..9dbf826dd54 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -313,7 +313,7 @@ static void particle_calculate_parent_uvs(ParticleSystem 
*psys,
     }
   }
   if (!ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) {
-    MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->pdata, CD_MFACE);
+    MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->fdata, CD_MFACE);
     MFace *mface = &mfaces[num];
     for (int j = 0; j < num_uv_layers; j++) {
       psys_interpolate_uvs(mtfaces[j] + num, mface->v4, particle->fuv, 
r_uv[j]);
@@ -343,7 +343,7 @@ static void particle_calculate_parent_mcol(ParticleSystem 
*psys,
     }
   }
   if (!ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) {
-    MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->pdata, CD_MFACE);
+    MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->fdata, CD_MFACE);
     MFace *mface = &mfaces[num];
     for (int j = 0; j < num_col_layers; j++) {
       /* CustomDataLayer CD_MCOL has 4 structs per face. */
@@ -370,7 +370,7 @@ static void 
particle_interpolate_children_uvs(ParticleSystem *psys,
   ChildParticle *particle = &psys->child[child_index];
   int num = particle->num;
   if (num != DMCACHE_NOTFOUND) {
-    MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->pdata, CD_MFACE);
+    MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->fdata, CD_MFACE);
     MFace *mface = &mfaces[num];
     for (int j = 0; j < num_uv_layers; j++) {
       psys_interpolate_uvs(mtfaces[j] + num, mface->v4, particle->fuv, 
r_uv[j]);
@@ -395,7 +395,7 @@ static void 
particle_interpolate_children_mcol(ParticleSystem *psys,
   ChildParticle *particle = &psys->child[child_index];
   int num = particle->num;
   if (num != DMCACHE_NOTFOUND) {
-    MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->pdata, CD_MFACE);
+    MFace *mfaces = CustomData_get_layer(&psmd->mesh_final->fdata, CD_MFACE);
     MFace *mface = &mfaces[num];
     for (int j = 0; j < num_col_layers; j++) {
       /* CustomDataLayer CD_MCOL has 4 structs per face. */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs