Curves: support sculpting on deformed curves

Previously, curves sculpt tools only worked on original data. This was
very limiting, because one could effectively only sculpt the curves when
all procedural effects were turned off. This patch adds support for curves
sculpting while looking the result of procedural effects (like deformation
based on the surface mesh). This functionality is also known as "crazy space"
support in Blender.

For more details see D15407.

Differential Revision: https://developer.blender.org/D15407

2 files changed, 29 insertions, 0 deletions

diff --git a/source/blender/nodes/intern/geometry_nodes_eval_log.cc b/source/blender/nodes/intern/geometry_nodes_eval_log.cc
index cf7cbbdc4bf..55930dcb1ee 100644
--- a/source/blender/nodes/intern/geometry_nodes_eval_log.cc
+++ b/source/blender/nodes/intern/geometry_nodes_eval_log.cc
@@ -2,6 +2,7 @@
 
 #include "NOD_geometry_nodes_eval_log.hh"
 
+#include "BKE_curves.hh"
 #include "BKE_geometry_set_instances.hh"
 
 #include "DNA_modifier_types.h"
@@ -264,6 +265,17 @@ GeometryValueLog::GeometryValueLog(const GeometrySet &geometry_set, bool log_ful
         info.instances_num = instances_component.instances_num();
         break;
       }
+      case GEO_COMPONENT_TYPE_EDIT: {
+        const GeometryComponentEditData &edit_component = *(
+            const GeometryComponentEditData *)component;
+        if (const bke::CurvesEditHints *curve_edit_hints =
+                edit_component.curves_edit_hints_.get()) {
+          EditDataInfo &info = this->edit_data_info.emplace();
+          info.has_deform_matrices = curve_edit_hints->deform_mats.has_value();
+          info.has_deformed_positions = curve_edit_hints->positions.has_value();
+        }
+        break;
+      }
       case GEO_COMPONENT_TYPE_VOLUME: {
         break;
       }
diff --git a/source/blender/nodes/intern/node_geometry_exec.cc b/source/blender/nodes/intern/node_geometry_exec.cc
index 56e9c9f0496..c6ebc22c43c 100644
--- a/source/blender/nodes/intern/node_geometry_exec.cc
+++ b/source/blender/nodes/intern/node_geometry_exec.cc
@@ -4,6 +4,7 @@
 
 #include "DEG_depsgraph_query.h"
 
+#include "BKE_curves.hh"
 #include "BKE_type_conversions.hh"
 
 #include "NOD_geometry_exec.hh"
@@ -94,11 +95,27 @@ void GeoNodeExecParams::check_input_geometry_set(StringRef identifier,
         message += TIP_("Curve");
         break;
       }
+      case GEO_COMPONENT_TYPE_EDIT: {
+        continue;
+      }
     }
     this->error_message_add(NodeWarningType::Info, std::move(message));
   }
 }
 
+void GeoNodeExecParams::check_output_geometry_set(const GeometrySet &geometry_set) const
+{
+  UNUSED_VARS_NDEBUG(geometry_set);
+#ifdef DEBUG
+  if (const bke::CurvesEditHints *curve_edit_hints =
+          geometry_set.get_curve_edit_hints_for_read()) {
+    /* If this is not valid, it's likely that the number of stored deformed points does not match
+     * the number of points in the original data. */
+    BLI_assert(curve_edit_hints->is_valid());
+  }
+#endif
+}
+
 const bNodeSocket *GeoNodeExecParams::find_available_socket(const StringRef name) const
 {
   for (const InputSocketRef *socket : provider_->dnode->inputs()) {