blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Geometry Nodes: add simulation support #104924

Closed
Hans Goudey wants to merge 211 commits from geometry-nodes-simulation into main
pull from: geometry-nodes-simulation
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 14 Commits 211 Files Changed 65 +2 -8
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e41cd795a6 - Show all commits

10
source/blender/editors/space_node/node_draw.cc
View File

@ -3146,13 +3146,10 @@ static void node_draw_zones(TreeDrawContext & /*tree_draw_ctx*/,
boundary_curve.cyclic_for_write().first() = true;
boundary_curve.fill_curve_types(CURVE_TYPE_POLY);
MutableSpan<float3> boundary_curve_positions = boundary_curve.positions_for_write();
MutableSpan<int> boundary_curve_offsets = boundary_curve.offsets_for_write();
boundary_curve_offsets[0] = 0;
boundary_curve_offsets[1] = boundary_positions_num;
boundary_curve.offsets_for_write().copy_from({0, boundary_positions_num});
for (const int i : boundary_positions.index_range()) {
boundary_curve_positions[i] = float3(boundary_positions[i], 0.0f);
}
boundary_curve.tag_topology_changed();
fillet_curve_by_zone[zone_i] = geometry::fillet_curves_poly(
boundary_curve,
@ -3175,10 +3172,7 @@ static void node_draw_zones(TreeDrawContext & /*tree_draw_ctx*/,
const uint pos = GPU_vertformat_attr_add(
immVertexFormat(), "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
/**
* Draw all the contour lines after to prevent them from getting hidden.
* Once we support other zones (e.g., for loops) we will need to sort them in a smarter way.
*/
/* Draw all the contour lines after to prevent them from getting hidden by overlapping zones. */
for (const int zone_i : zones->zones.index_range()) {
if (zone_color[3] == 0.0f) {
break;