[Bf-blender-cvs] [846d8ef8568] refactor-mesh-position-generic: Progress
Hans Goudey
noreply at git.blender.org
Fri Oct 7 06:33:48 CEST 2022
Commit: 846d8ef8568c035cd7d4e1a8168a4ba391de9119
Author: Hans Goudey
Date: Mon Oct 3 08:18:14 2022 -0500
Branches: refactor-mesh-position-generic
https://developer.blender.org/rB846d8ef8568c035cd7d4e1a8168a4ba391de9119
Progress
===================================================================
M source/blender/draw/DRW_pbvh.h
M source/blender/draw/intern/draw_pbvh.cc
===================================================================
diff --git a/source/blender/draw/DRW_pbvh.h b/source/blender/draw/DRW_pbvh.h
index ffd4b92d87b..fa51afe786f 100644
--- a/source/blender/draw/DRW_pbvh.h
+++ b/source/blender/draw/DRW_pbvh.h
@@ -41,7 +41,7 @@ typedef struct PBVH_GPU_Args {
struct BMesh *bm;
const struct Mesh *me;
- const struct MVert *mvert;
+ const float (*mesh_positions)[3];
const struct MLoop *mloop;
const struct MPoly *mpoly;
int mesh_verts_num, mesh_faces_num, mesh_grids_num;
diff --git a/source/blender/draw/intern/draw_pbvh.cc b/source/blender/draw/intern/draw_pbvh.cc
index 287270079e5..9cb7c3aa71e 100644
--- a/source/blender/draw/intern/draw_pbvh.cc
+++ b/source/blender/draw/intern/draw_pbvh.cc
@@ -307,7 +307,7 @@ struct PBVHBatches {
if (!(mp->flag & ME_SMOOTH)) {
smooth = true;
- BKE_mesh_calc_poly_normal(mp, args->mloop + mp->loopstart, args->mvert, fno);
+ BKE_mesh_calc_poly_normal(mp, args->mloop + mp->loopstart, args->mesh_positions, fno);
normal_float_to_short_v3(no, fno);
}
else {
@@ -537,7 +537,8 @@ struct PBVHBatches {
case CD_PBVH_CO_TYPE:
foreach_faces(
[&](int /*buffer_i*/, int /*tri_i*/, int vertex_i, const MLoopTri * /*tri*/) {
- *static_cast<float3 *>(GPU_vertbuf_raw_step(&access)) = args->mvert[vertex_i].co;
+ *static_cast<float3 *>(
+ GPU_vertbuf_raw_step(&access)) = args->mesh_positions[vertex_i];
});
break;
case CD_PBVH_NO_TYPE:
More information about the Bf-blender-cvs
mailing list