Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2021-07-02 21:24:42 +0300
committerHans Goudey <h.goudey@me.com>2021-07-02 21:24:42 +0300
commit55f27617cf3d527d4f9ed47d0bf739af44651960 (patch)
treea1c2b8253679e59bc12e2feeb949a07d3d5860ab
parent00e30f122bde473343bf0afb85358a88a538cb6d (diff)
Geometry Nodes: Add mesh input warning to curve to mesh node
A point of confusion about this node is that it doesn't work on the output of the mesh circle primitive node. This patch adds a warning to help with that. This avoids adding a warning when the geometry set input has no mesh. Differential Revision: https://developer.blender.org/D11771
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc
index c0d817385e2..159c4fffb57 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc
@@ -337,7 +337,17 @@ static void geo_node_curve_to_mesh_exec(GeoNodeExecParams params)
curve_set = bke::geometry_set_realize_instances(curve_set);
profile_set = bke::geometry_set_realize_instances(profile_set);
+ /* Note: Theoretically an "is empty" check would be more correct for errors. */
+ if (profile_set.has_mesh() && !profile_set.has_curve()) {
+ params.error_message_add(NodeWarningType::Warning,
+ TIP_("No curve data available in profile input"));
+ }
+
if (!curve_set.has_curve()) {
+ if (curve_set.has_mesh()) {
+ params.error_message_add(NodeWarningType::Warning,
+ TIP_("No curve data available in curve input"));
+ }
params.set_output("Mesh", GeometrySet());
return;
}