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-02-16 22:06:18 +0300
committerHans Goudey <h.goudey@me.com>2021-02-16 22:06:18 +0300
commiteb2e260540439e75cd8fb74e9bb41d1e87213496 (patch)
treefd501b49b6df6d9acc9c08c5e4e34223caf3e478 /source/blender/nodes/NOD_geometry_exec.hh
parentc075b8bff22073b890679855b3342a57640bfba4 (diff)
Cleanup: Used derived node in geometry exec params
Since the derived node tree is already build for the evaluation system, it's simpler to pass a derived node to the params struct. This will also allow context lookups in nested node groups for node error messages, since the derived node has that information readily accessible.
Diffstat (limited to 'source/blender/nodes/NOD_geometry_exec.hh')
-rw-r--r--source/blender/nodes/NOD_geometry_exec.hh8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/nodes/NOD_geometry_exec.hh b/source/blender/nodes/NOD_geometry_exec.hh
index 1149ab51ad0..18de52ed6d4 100644
--- a/source/blender/nodes/NOD_geometry_exec.hh
+++ b/source/blender/nodes/NOD_geometry_exec.hh
@@ -25,6 +25,8 @@
#include "DNA_node_types.h"
+#include "NOD_derived_node_tree.hh"
+
struct Depsgraph;
namespace blender::nodes {
@@ -55,7 +57,7 @@ using fn::GValueMap;
class GeoNodeExecParams {
private:
- const bNode &node_;
+ const DNode &node_;
GValueMap<StringRef> &input_values_;
GValueMap<StringRef> &output_values_;
const PersistentDataHandleMap &handle_map_;
@@ -63,7 +65,7 @@ class GeoNodeExecParams {
Depsgraph *depsgraph_;
public:
- GeoNodeExecParams(const bNode &node,
+ GeoNodeExecParams(const DNode &node,
GValueMap<StringRef> &input_values,
GValueMap<StringRef> &output_values,
const PersistentDataHandleMap &handle_map,
@@ -178,7 +180,7 @@ class GeoNodeExecParams {
*/
const bNode &node() const
{
- return node_;
+ return *node_.bnode();
}
const PersistentDataHandleMap &handle_map() const