blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Geometry Nodes: pass depsgraph to nodes during execution 

The depsgraph will have to be accessed in an upcoming patch.
This commit is contained in:
Jacques Lucke 2021-01-19 16:58:05 +01:00
parent d60b128274
commit 9a32c7130b
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/modifiers/intern/MOD_nodes.cc
View File

@ -221,18 +221,21 @@ class GeometryNodesEvaluator {
const blender::nodes::DataTypeConversions &conversions_;
const PersistentDataHandleMap &handle_map_;
const Object *self_object_;
Depsgraph *depsgraph_;
public:
GeometryNodesEvaluator(const Map<const DOutputSocket *, GMutablePointer> &group_input_data,
Vector<const DInputSocket *> group_outputs,
blender::nodes::MultiFunctionByNode &mf_by_node,
const PersistentDataHandleMap &handle_map,
const Object *self_object)
const Object *self_object,
Depsgraph *depsgraph)
: group_outputs_(std::move(group_outputs)),
mf_by_node_(mf_by_node),
conversions_(blender::nodes::get_implicit_type_conversions()),
handle_map_(handle_map),
self_object_(self_object)
self_object_(self_object),
depsgraph_(depsgraph)
{
for (auto item : group_input_data.items()) {
this->forward_to_inputs(*item.key, item.value);
@ -306,7 +309,8 @@ class GeometryNodesEvaluator {
/* Execute the node. */
GValueMap<StringRef> node_outputs_map{allocator_};
GeoNodeExecParams params{bnode, node_inputs_map, node_outputs_map, handle_map_, self_object_};
GeoNodeExecParams params{
bnode, node_inputs_map, node_outputs_map, handle_map_, self_object_, depsgraph_};
this->execute_node(node, params);
/* Forward computed outputs to linked input sockets. */
@ -926,7 +930,7 @@ static GeometrySet compute_geometry(const DerivedNodeTree &tree,
group_outputs.append(&socket_to_compute);
GeometryNodesEvaluator evaluator{
group_inputs, group_outputs, mf_by_node, handle_map, ctx->object};
group_inputs, group_outputs, mf_by_node, handle_map, ctx->object, ctx->depsgraph};
Vector<GMutablePointer> results = evaluator.execute();
BLI_assert(results.size() == 1);
GMutablePointer result = results[0];

14
source/blender/nodes/NOD_geometry_exec.hh
View File

@ -24,6 +24,8 @@
#include "DNA_node_types.h"
struct Depsgraph;
namespace blender::nodes {
using bke::BooleanReadAttribute;
@ -54,18 +56,21 @@ class GeoNodeExecParams {
GValueMap<StringRef> &output_values_;
const PersistentDataHandleMap &handle_map_;
const Object *self_object_;
Depsgraph *depsgraph_;
public:
GeoNodeExecParams(const bNode &node,
GValueMap<StringRef> &input_values,
GValueMap<StringRef> &output_values,
const PersistentDataHandleMap &handle_map,
const Object *self_object)
const Object *self_object,
Depsgraph *depsgraph)
: node_(node),
input_values_(input_values),
output_values_(output_values),
handle_map_(handle_map),
self_object_(self_object)
self_object_(self_object),
depsgraph_(depsgraph)
{
}
@ -163,6 +168,11 @@ class GeoNodeExecParams {
return self_object_;
}
Depsgraph *depsgraph() const
{
return depsgraph_;
}
/**
* Creates a read-only attribute based on node inputs. The method automatically detects which
* input with the given name is available.