[Bf-blender-cvs] [4a7736ce1d0] spreadsheet-active-node: Merge branch 'master' into spreadsheet-active-node

[Jacques Lucke]

Commit: 4a7736ce1d0d224b6a7e86e173088da65142422a
Author: Jacques Lucke
Date:   Thu Apr 1 13:16:48 2021 +0200
Branches: spreadsheet-active-node
https://developer.blender.org/rB4a7736ce1d0d224b6a7e86e173088da65142422a

Merge branch 'master' into spreadsheet-active-node

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



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

diff --cc source/blender/modifiers/intern/MOD_nodes.cc
index 61f513f1eb8,267c4be5571..becf74d5cce
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@@ -1213,28 -1143,6 +1213,28 @@@ static GeometrySet compute_geometry(con
    Vector<DInputSocket> group_outputs;
    group_outputs.append({root_context, &socket_to_compute});
  
 +  const DNode active_node = find_matching_active_derived_node(ctx->depsgraph, tree);
 +
-   auto handle_socket_value = [&](const DSocket socket, const Span<GPointer> values) {
++  auto log_socket_value = [&](const DSocket socket, const Span<GPointer> values) {
 +    const DNode node = socket.node();
 +    if (node != active_node) {
 +      return;
 +    }
 +    if (socket->is_input() && !node->outputs().is_empty()) {
 +      return;
 +    }
 +    if (values.size() != 1) {
 +      return;
 +    }
 +    const GPointer value = values[0];
 +    if (*value.type() != CPPType::get<GeometrySet>()) {
 +      return;
 +    }
 +    GeometrySet geometry_set = *(const GeometrySet *)value.get();
 +    geometry_set.ensure_own_non_instances();
 +    BKE_object_preview_geometry_set(ctx->object, new GeometrySet(std::move(geometry_set)));
 +  };
 +
    GeometryNodesEvaluator evaluator{group_inputs,
                                     group_outputs,
                                     mf_by_node,
@@@ -1242,7 -1150,7 +1242,7 @@@
                                     ctx->object,
                                     (ModifierData *)nmd,
                                     ctx->depsgraph,
-                                    handle_socket_value};
 -                                   {}};
++                                   log_socket_value};
  
    Vector<GMutablePointer> results = evaluator.execute();
    BLI_assert(results.size() == 1);