[Bf-blender-cvs] [42a40f4e7c8] spreadsheet-active-node: support showing data of group input/output nodes

Jacques Lucke noreply at git.blender.org
Thu Apr 1 13:55:19 CEST 2021


Commit: 42a40f4e7c853e2f487e1cddcdefb7c13fcc4fd8
Author: Jacques Lucke
Date:   Thu Apr 1 11:41:30 2021 +0200
Branches: spreadsheet-active-node
https://developer.blender.org/rB42a40f4e7c853e2f487e1cddcdefb7c13fcc4fd8

support showing data of group input/output nodes

===================================================================

M	source/blender/modifiers/intern/MOD_nodes.cc

===================================================================

diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index ed3c3cfe4b1..9a4089180c2 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -334,6 +334,7 @@ class GeometryNodesEvaluator {
         socket_value_fn_(std::move(socket_value_fn))
   {
     for (auto item : group_input_data.items()) {
+      this->handle_socket_value(item.key, item.value);
       this->forward_to_inputs(item.key, item.value);
     }
   }
@@ -343,6 +344,7 @@ class GeometryNodesEvaluator {
     Vector<GMutablePointer> results;
     for (const DInputSocket &group_output : group_outputs_) {
       Vector<GMutablePointer> result = this->get_input_values(group_output);
+      this->handle_socket_value(group_output, result);
       results.append(result[0]);
     }
     for (GMutablePointer value : value_by_input_.values()) {
@@ -1206,7 +1208,7 @@ static GeometrySet compute_geometry(const DerivedNodeTree &tree,
     if (node != active_dnode) {
       return;
     }
-    if (socket->is_input()) {
+    if (socket->is_input() && !node->outputs().is_empty()) {
       return;
     }
     if (values.size() != 1) {



More information about the Bf-blender-cvs mailing list