blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 773 Projects 19 Wiki Activity

Geometry Nodes: Make simulation caching optional #107767

Merged
Hans Goudey merged 13 commits from HooglyBoogly/blender:simulation-use-cache-option into main 2023-05-10 16:01:44 +02:00
Conversation 0 Commits 13 Files Changed 10 -19
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bac123d6ae - Show all commits

19
source/blender/bmesh/intern/bmesh_mesh_convert.cc
View File

@ -1266,15 +1266,11 @@ static void bm_to_mesh_verts(const BMesh &bm,
CustomData_add_layer_named(&mesh.vdata, CD_PROP_FLOAT3, CD_CONSTRUCT, mesh.totvert, "position");
const Vector<BMeshToMeshLayerInfo> info = bm_to_mesh_copy_info_calc(bm.vdata, mesh.vdata);
MutableSpan<float3> dst_vert_positions = mesh.vert_positions_for_write();
std::atomic<bool> any_loose_vert = false;
threading::parallel_for(dst_vert_positions.index_range(), 1024, [&](const IndexRange range) {
bool any_loose_vert_local = false;
for (const int vert_i : range) {
Jacques Lucke commented 2023-05-09 14:00:28 +02:00
Outdated
Review
Copy Link

unrelated changes

unrelated changes
const BMVert &src_vert = *bm_verts[vert_i];
copy_v3_v3(dst_vert_positions[vert_i], src_vert.co);
bmesh_block_copy_to_mesh_attributes(info, vert_i, src_vert.head.data);
any_loose_vert_local |= src_vert.e == nullptr;
}
if (!select_vert.is_empty()) {
for (const int vert_i : range) {
@ -1287,10 +1283,6 @@ static void bm_to_mesh_verts(const BMesh &bm,
}
}
});
if (!any_loose_vert) {
mesh.loose_edges_tag_none();
}
}
static void bm_to_mesh_edges(const BMesh &bm,
@ -1305,18 +1297,11 @@ static void bm_to_mesh_edges(const BMesh &bm,
&mesh.edata, CD_PROP_INT32_2D, CD_CONSTRUCT, mesh.totedge, ".edge_verts");
const Vector<BMeshToMeshLayerInfo> info = bm_to_mesh_copy_info_calc(bm.edata, mesh.edata);
MutableSpan<int2> dst_edges = mesh.edges_for_write();
std::atomic<bool> any_loose_edge = false;
threading::parallel_for(dst_edges.index_range(), 512, [&](const IndexRange range) {
bool any_loose_edge_local = false;
for (const int edge_i : range) {
const BMEdge &src_edge = *bm_edges[edge_i];
dst_edges[edge_i] = int2(BM_elem_index_get(src_edge.v1), BM_elem_index_get(src_edge.v2));
bmesh_block_copy_to_mesh_attributes(info, edge_i, src_edge.head.data);
any_loose_edge_local |= BM_edge_is_wire(&src_edge);
}
if (any_loose_edge_local) {
any_loose_edge.store(true, std::memory_order_relaxed);
}
if (!select_edge.is_empty()) {
for (const int edge_i : range) {
@ -1339,10 +1324,6 @@ static void bm_to_mesh_edges(const BMesh &bm,
}
}
});
if (!any_loose_edge) {
mesh.loose_edges_tag_none();
}
}
static void bm_to_mesh_faces(const BMesh &bm,