bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Sculpt: Use C++ types for orig vert data

Browse Source
This commit is contained in:
Hans Goudey 2024-05-15 10:41:33 -04:00
parent b76612998c
commit b8e419ba1e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/sculpt_paint/sculpt.cc
View File

@ -1219,10 +1219,10 @@ void SCULPT_orig_vert_data_unode_init(SculptOrigVertData &data,
data.bm_log = ss->bm_log;
}
else {
data.coords = reinterpret_cast<float(*)[3]>(data.unode->position.data());
data.normals = reinterpret_cast<float(*)[3]>(data.unode->normal.data());
data.coords = data.unode->position.data();
data.normals = data.unode->normal.data();
data.vmasks = data.unode->mask.data();
data.colors = reinterpret_cast<float(*)[4]>(data.unode->col.data());
data.colors = data.unode->col.data();
}
}
@ -1369,7 +1369,7 @@ static void restore_color(Object &object, const Span<PBVHNode *> nodes)
SculptSession *ss = object.sculpt;
const auto restore_generic = [&](PBVHNode *node, undo::Node *unode) {
SculptOrigVertData orig_vert_data;
SCULPT_orig_vert_data_unode_init(orig_vert_data, object, unode);
SCULPT_orig_vert_data_unode_init(orig_vert_data, object, *unode);
PBVHVertexIter vd;
BKE_pbvh_vertex_iter_begin (*ss->pbvh, node, vd, PBVH_ITER_UNIQUE) {
SCULPT_orig_vert_data_update(orig_vert_data, vd);

6
source/blender/editors/sculpt_paint/sculpt_intern.hh
View File

@ -103,10 +103,10 @@ struct SculptOrigVertData {
BMLog *bm_log;
blender::ed::sculpt_paint::undo::Node *unode;
float (*coords)[3];
float (*normals)[3];
const blender::float3 *coords;
const blender::float3 *normals;
const float *vmasks;
float (*colors)[4];
const blender::float4 *colors;
/* Original coordinate, normal, and mask. */
const float *co;