archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Geometry Nodes: move type conversions to blenkernel

Browse Source 
The type conversions do not depend on other files in the nodes
module. Furthermore we want to use the conversions in the
geometry module without creating a dependency to the
nodes module there.
This commit is contained in:
Jacques Lucke
2021-12-07 15:21:59 +01:00
parent 2309fa20af
commit a8e0fe6a54
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/nodes/intern/node_geometry_exec.cc
View File

@@ -18,8 +18,9 @@
#include "DEG_depsgraph_query.h"
#include "BKE_type_conversions.hh"
#include "NOD_geometry_exec.hh"
#include "NOD_type_conversions.hh"
#include "node_geometry_util.hh"
@@ -149,7 +150,7 @@ GVArray GeoNodeExecParams::get_input_attribute(const StringRef name,
}
return GVArray::ForSingle(*cpp_type, domain_size, default_value);
}
const DataTypeConversions &conversions = get_implicit_type_conversions();
const bke::DataTypeConversions &conversions = bke::get_implicit_type_conversions();
if (found_socket->type == SOCK_FLOAT) {
const float value = this->get_input<float>(found_socket->identifier);
BUFFER_FOR_CPP_TYPE_VALUE(*cpp_type, buffer);