blender
/
blender
135
425
Fork 607
Code Issues 6.2k Pull Requests 778 Projects 19 Wiki Activity

GPv3: Initial Geometry Nodes support #112535

Merged
Falk David merged 61 commits from filedescriptor/blender:gpv3-geometry-nodes into main 2023-10-10 16:49:39 +02:00
Conversation 4 Commits 61 Files Changed 36 +10 -11
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f0197f6f99 - Show all commits

21
source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
View File

@ -159,19 +159,18 @@ static void geometry_set_curve_trim(GeometrySet &geometry_set,
const bke::CurvesGeometry &src_curves = src_curves_id.geometry.wrap();
bke::CurvesGeometry dst_curves;
if (!set_curve_trim(src_curves,
mode,
selection_field,
start_field,
end_field,
propagation_info,
dst_curves))
if (set_curve_trim(src_curves,
mode,
selection_field,
start_field,
end_field,
propagation_info,
dst_curves))
{
return;
Curves *dst_curves_id = bke::curves_new_nomain(std::move(dst_curves));
filedescriptor marked this conversation as resolved Outdated
Dalai Felinto commented 2023-10-06 15:30:15 +02:00
Outdated
Review
Copy Link

This would make the node to skip the grease pencil part of it. It probably needs to be an if/else

This would make the node to skip the grease pencil part of it. It probably needs to be an if/else
bke::curves_copy_parameters(src_curves_id, *dst_curves_id);
geometry_set.replace_curves(dst_curves_id);
}
Curves *dst_curves_id = bke::curves_new_nomain(std::move(dst_curves));
bke::curves_copy_parameters(src_curves_id, *dst_curves_id);
geometry_set.replace_curves(dst_curves_id);
}
if (geometry_set.has_grease_pencil()) {
using namespace bke::greasepencil;