[Bf-blender-cvs] [2d3287abf7e] refactor-mesh-corners-generic: Fix various incorrect array retrieval

Hans Goudey noreply at git.blender.org
Thu Dec 8 20:17:49 CET 2022


Commit: 2d3287abf7eac22aa8a2bc6c78c4d81a9eb6b972
Author: Hans Goudey
Date:   Thu Dec 8 13:06:08 2022 -0600
Branches: refactor-mesh-corners-generic
https://developer.blender.org/rB2d3287abf7eac22aa8a2bc6c78c4d81a9eb6b972

Fix various incorrect array retrieval

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

M	source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc
M	source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc

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

diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc
index 3c824977352..2159af118a0 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc
@@ -156,8 +156,8 @@ static void extract_edit_data_iter_poly_mesh(const MeshRenderData *mr,
     EditLoopData *data = vbo_data + ml_index;
     memset(data, 0x0, sizeof(*data));
     BMFace *efa = bm_original_face_get(mr, mp_index);
-    BMEdge *eed = bm_original_edge_get(mr, mr->corner_verts[ml_index]);
-    BMVert *eve = bm_original_vert_get(mr, mr->corner_edges[ml_index]);
+    BMVert *eve = bm_original_vert_get(mr, mr->corner_verts[ml_index]);
+    BMEdge *eed = bm_original_edge_get(mr, mr->corner_edges[ml_index]);
     if (efa) {
       mesh_render_data_face_flag(mr, efa, -1, data);
     }
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc
index 952f9521f75..606e4e6ac26 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc
@@ -82,8 +82,8 @@ static void extract_edituv_data_iter_poly_mesh(const MeshRenderData *mr,
     memset(eldata, 0x0, sizeof(*eldata));
     BMFace *efa = bm_original_face_get(mr, mp_index);
     if (efa) {
-      BMEdge *eed = bm_original_edge_get(mr,mr->corner_verts[ml_index] );
-      BMVert *eve = bm_original_vert_get(mr,mr->corner_edges[ml_index] );
+      BMVert *eve = bm_original_vert_get(mr, mr->corner_verts[ml_index]);
+      BMEdge *eed = bm_original_edge_get(mr, mr->corner_edges[ml_index]);
       if (eed && eve) {
         /* Loop on an edge endpoint. */
         BMLoop *l = BM_face_edge_share_loop(efa, eed);



More information about the Bf-blender-cvs mailing list