kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix Cycles rendering crash on OpenBSD

Browse Source 
Static initialization order was not guaranteed to be correct for node base
types. Now wrap all initialization in accessor functions to ensure the order
is correct.

Did not cause any known bug on Linux/macOS/Windows, but showed up on this
platform.
This commit is contained in:
Brecht Van Lommel 2021-03-15 16:11:12 +01:00
parent 3fdef12162
commit cd3fade2aa
17 changed files with 141 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/graph/node_type.cpp
View File

@ -154,7 +154,7 @@ void NodeType::register_input(ustring name,
int struct_offset, int struct_offset,
const void *default_value, const void *default_value,
const NodeEnum *enum_values, const NodeEnum *enum_values,
const NodeType **node_type, const NodeType *node_type,
int flags, int flags,
int extra_flags) int extra_flags)
{ {

27
intern/cycles/graph/node_type.h
View File

@ -87,7 +87,7 @@ struct SocketType {
int struct_offset; int struct_offset;
const void *default_value; const void *default_value;
const NodeEnum *enum_values; const NodeEnum *enum_values;
const NodeType **node_type; const NodeType *node_type;
int flags; int flags;
ustring ui_name; ustring ui_name;
SocketModifiedFlags modified_flag_bit; SocketModifiedFlags modified_flag_bit;
@ -115,7 +115,7 @@ struct NodeType {
int struct_offset, int struct_offset,
const void *default_value, const void *default_value,
const NodeEnum *enum_values = NULL, const NodeEnum *enum_values = NULL,
const NodeType **node_type = NULL, const NodeType *node_type = NULL,
int flags = 0, int flags = 0,
int extra_flags = 0); int extra_flags = 0);
void register_output(ustring name, ustring ui_name, SocketType::Type type); void register_output(ustring name, ustring ui_name, SocketType::Type type);
@ -140,27 +140,38 @@ struct NodeType {
static unordered_map<ustring, NodeType, ustringHash> &types(); static unordered_map<ustring, NodeType, ustringHash> &types();
}; };
/* Node Definition Macros */ /* Node Definition Macros
*
* Node we use accessor to get node types to ensure correct static
* initialization order. */
#define NODE_DECLARE \ #define NODE_DECLARE \
static const NodeType *get_node_type(); \
template<typename T> static const NodeType *register_type(); \ template<typename T> static const NodeType *register_type(); \
static Node *create(const NodeType *type); \ static Node *create(const NodeType *type);
static const NodeType *node_type;
#define NODE_DEFINE(structname) \ #define NODE_DEFINE(structname) \
const NodeType *structname::node_type = structname::register_type<structname>(); \
Node *structname::create(const NodeType *) \ Node *structname::create(const NodeType *) \
{ \ { \
return new structname(); \ return new structname(); \
} \ } \
const NodeType *structname::get_node_type() \
{ \
static const NodeType *node_type = register_type<structname>(); \
return node_type; \
} \
template<typename T> const NodeType *structname::register_type() template<typename T> const NodeType *structname::register_type()
#define NODE_ABSTRACT_DECLARE \ #define NODE_ABSTRACT_DECLARE \
template<typename T> static const NodeType *register_base_type(); \ template<typename T> static const NodeType *register_base_type(); \
static const NodeType *node_base_type; static const NodeType *get_node_base_type();
#define NODE_ABSTRACT_DEFINE(structname) \ #define NODE_ABSTRACT_DEFINE(structname) \
const NodeType *structname::node_base_type = structname::register_base_type<structname>(); \ const NodeType *structname::get_node_base_type() \
{ \
static const NodeType *node_base_type = register_base_type<structname>(); \
return node_base_type; \
} \
template<typename T> const NodeType *structname::register_base_type() template<typename T> const NodeType *structname::register_base_type()
/* Sock Definition Macros */ /* Sock Definition Macros */

4
intern/cycles/graph/node_xml.cpp
View File

@ -200,7 +200,7 @@ void xml_read_node(XMLReader &reader, Node *node, xml_node xml_node)
map<ustring, Node *>::iterator it = reader.node_map.find(value); map<ustring, Node *>::iterator it = reader.node_map.find(value);
if (it != reader.node_map.end()) { if (it != reader.node_map.end()) {
Node *value_node = it->second; Node *value_node = it->second;
if (value_node->is_a(*(socket.node_type))) if (value_node->is_a(socket.node_type))
node->set(socket, it->second); node->set(socket, it->second);
} }
break; break;
@ -215,7 +215,7 @@ void xml_read_node(XMLReader &reader, Node *node, xml_node xml_node)
map<ustring, Node *>::iterator it = reader.node_map.find(ustring(tokens[i])); map<ustring, Node *>::iterator it = reader.node_map.find(ustring(tokens[i]));
if (it != reader.node_map.end()) { if (it != reader.node_map.end()) {
Node *value_node = it->second; Node *value_node = it->second;
value[i] = (value_node->is_a(*(socket.node_type))) ? value_node : NULL; value[i] = (value_node->is_a(socket.node_type)) ? value_node : NULL;
} }
else { else {
value[i] = NULL; value[i] = NULL;

8
intern/cycles/render/alembic.cpp
View File

@ -599,7 +599,7 @@ NODE_DEFINE(AlembicObject)
NodeType *type = NodeType::add("alembic_object", create); NodeType *type = NodeType::add("alembic_object", create);
SOCKET_STRING(path, "Alembic Path", ustring()); SOCKET_STRING(path, "Alembic Path", ustring());
SOCKET_NODE_ARRAY(used_shaders, "Used Shaders", &Shader::node_type); SOCKET_NODE_ARRAY(used_shaders, "Used Shaders", Shader::get_node_type());
SOCKET_INT(subd_max_level, "Max Subdivision Level", 1); SOCKET_INT(subd_max_level, "Max Subdivision Level", 1);
SOCKET_FLOAT(subd_dicing_rate, "Subdivision Dicing Rate", 1.0f); SOCKET_FLOAT(subd_dicing_rate, "Subdivision Dicing Rate", 1.0f);
@ -609,7 +609,7 @@ NODE_DEFINE(AlembicObject)
return type; return type;
} }
AlembicObject::AlembicObject() : Node(node_type) AlembicObject::AlembicObject() : Node(get_node_type())
{ {
schema_type = INVALID; schema_type = INVALID;
} }
@ -1320,12 +1320,12 @@ NODE_DEFINE(AlembicProcedural)
SOCKET_FLOAT(default_radius, "Default Radius", 0.01f); SOCKET_FLOAT(default_radius, "Default Radius", 0.01f);
SOCKET_FLOAT(scale, "Scale", 1.0f); SOCKET_FLOAT(scale, "Scale", 1.0f);
SOCKET_NODE_ARRAY(objects, "Objects", &AlembicObject::node_type); SOCKET_NODE_ARRAY(objects, "Objects", AlembicObject::get_node_type());
return type; return type;
} }
AlembicProcedural::AlembicProcedural() : Procedural(node_type) AlembicProcedural::AlembicProcedural() : Procedural(get_node_type())
{ {
objects_loaded = false; objects_loaded = false;
scene_ = nullptr; scene_ = nullptr;

4
intern/cycles/render/background.cpp
View File

@ -47,12 +47,12 @@ NODE_DEFINE(Background)
SOCKET_FLOAT(volume_step_size, "Volume Step Size", 0.1f); SOCKET_FLOAT(volume_step_size, "Volume Step Size", 0.1f);
SOCKET_NODE(shader, "Shader", &Shader::node_type); SOCKET_NODE(shader, "Shader", Shader::get_node_type());
return type; return type;
} }
Background::Background() : Node(node_type) Background::Background() : Node(get_node_type())
{ {
shader = NULL; shader = NULL;
} }

2
intern/cycles/render/camera.cpp
View File

@ -163,7 +163,7 @@ NODE_DEFINE(Camera)
return type; return type;
} }
Camera::Camera() : Node(node_type) Camera::Camera() : Node(get_node_type())
{ {
shutter_table_offset = TABLE_OFFSET_INVALID; shutter_table_offset = TABLE_OFFSET_INVALID;

4
intern/cycles/render/film.cpp
View File

@ -96,7 +96,7 @@ NODE_DEFINE(Pass)
return type; return type;
} }
Pass::Pass() : Node(node_type) Pass::Pass() : Node(get_node_type())
{ {
} }
@ -407,7 +407,7 @@ NODE_DEFINE(Film)
return type; return type;
} }
Film::Film() : Node(node_type) Film::Film() : Node(get_node_type())
{ {
use_light_visibility = false; use_light_visibility = false;
filter_table_offset = TABLE_OFFSET_INVALID; filter_table_offset = TABLE_OFFSET_INVALID;

2
intern/cycles/render/geometry.cpp
View File

@ -52,7 +52,7 @@ NODE_ABSTRACT_DEFINE(Geometry)
SOCKET_UINT(motion_steps, "Motion Steps", 3); SOCKET_UINT(motion_steps, "Motion Steps", 3);
SOCKET_BOOLEAN(use_motion_blur, "Use Motion Blur", false); SOCKET_BOOLEAN(use_motion_blur, "Use Motion Blur", false);
SOCKET_NODE_ARRAY(used_shaders, "Shaders", &Shader::node_type); SOCKET_NODE_ARRAY(used_shaders, "Shaders", Shader::get_node_type());
return type; return type;
} }

4
intern/cycles/render/hair.cpp
View File

@ -283,7 +283,7 @@ void Hair::Curve::cardinal_keys_for_step(const float3 *curve_keys,
NODE_DEFINE(Hair) NODE_DEFINE(Hair)
{ {
NodeType *type = NodeType::add("hair", create, NodeType::NONE, Geometry::node_base_type); NodeType *type = NodeType::add("hair", create, NodeType::NONE, Geometry::get_node_base_type());
SOCKET_POINT_ARRAY(curve_keys, "Curve Keys", array<float3>()); SOCKET_POINT_ARRAY(curve_keys, "Curve Keys", array<float3>());
SOCKET_FLOAT_ARRAY(curve_radius, "Curve Radius", array<float>()); SOCKET_FLOAT_ARRAY(curve_radius, "Curve Radius", array<float>());
@ -293,7 +293,7 @@ NODE_DEFINE(Hair)
return type; return type;
} }
Hair::Hair() : Geometry(node_type, Geometry::HAIR) Hair::Hair() : Geometry(get_node_type(), Geometry::HAIR)
{ {
curvekey_offset = 0; curvekey_offset = 0;
curve_shape = CURVE_RIBBON; curve_shape = CURVE_RIBBON;

2
intern/cycles/render/integrator.cpp
View File

@ -96,7 +96,7 @@ NODE_DEFINE(Integrator)
return type; return type;
} }
Integrator::Integrator() : Node(node_type) Integrator::Integrator() : Node(get_node_type())
{ {
} }

10
intern/cycles/render/light.cpp
View File

@ -151,12 +151,12 @@ NODE_DEFINE(Light)
SOCKET_BOOLEAN(is_portal, "Is Portal", false); SOCKET_BOOLEAN(is_portal, "Is Portal", false);
SOCKET_BOOLEAN(is_enabled, "Is Enabled", true); SOCKET_BOOLEAN(is_enabled, "Is Enabled", true);
SOCKET_NODE(shader, "Shader", &Shader::node_type); SOCKET_NODE(shader, "Shader", Shader::get_node_type());
return type; return type;
} }
Light::Light() : Node(node_type) Light::Light() : Node(get_node_type())
{ {
} }
@ -609,7 +609,7 @@ void LightManager::device_update_background(Device *device,
Shader *shader = scene->background->get_shader(scene); Shader *shader = scene->background->get_shader(scene);
int num_suns = 0; int num_suns = 0;
foreach (ShaderNode *node, shader->graph->nodes) { foreach (ShaderNode *node, shader->graph->nodes) {
if (node->type == EnvironmentTextureNode::node_type) { if (node->type == EnvironmentTextureNode::get_node_type()) {
EnvironmentTextureNode *env = (EnvironmentTextureNode *)node; EnvironmentTextureNode *env = (EnvironmentTextureNode *)node;
ImageMetaData metadata; ImageMetaData metadata;
if (!env->handle.empty()) { if (!env->handle.empty()) {
@ -618,7 +618,7 @@ void LightManager::device_update_background(Device *device,
environment_res.y = max(environment_res.y, metadata.height); environment_res.y = max(environment_res.y, metadata.height);
} }
} }
if (node->type == SkyTextureNode::node_type) { if (node->type == SkyTextureNode::get_node_type()) {
SkyTextureNode *sky = (SkyTextureNode *)node; SkyTextureNode *sky = (SkyTextureNode *)node;
if (sky->get_sky_type() == NODE_SKY_NISHITA && sky->get_sun_disc()) { if (sky->get_sky_type() == NODE_SKY_NISHITA && sky->get_sun_disc()) {
/* Ensure that the input coordinates aren't transformed before they reach the node. /* Ensure that the input coordinates aren't transformed before they reach the node.
@ -627,7 +627,7 @@ void LightManager::device_update_background(Device *device,
const ShaderInput *vec_in = sky->input("Vector"); const ShaderInput *vec_in = sky->input("Vector");
if (vec_in && vec_in->link && vec_in->link->parent) { if (vec_in && vec_in->link && vec_in->link->parent) {
ShaderNode *vec_src = vec_in->link->parent; ShaderNode *vec_src = vec_in->link->parent;
if ((vec_src->type != TextureCoordinateNode::node_type) || if ((vec_src->type != TextureCoordinateNode::get_node_type()) ||
(vec_in->link != vec_src->output("Generated"))) { (vec_in->link != vec_src->output("Generated"))) {
environment_res.x = max(environment_res.x, 4096); environment_res.x = max(environment_res.x, 4096);
environment_res.y = max(environment_res.y, 2048); environment_res.y = max(environment_res.y, 2048);

4
intern/cycles/render/mesh.cpp
View File

@ -125,7 +125,7 @@ float3 Mesh::SubdFace::normal(const Mesh *mesh) const
NODE_DEFINE(Mesh) NODE_DEFINE(Mesh)
{ {
NodeType *type = NodeType::add("mesh", create, NodeType::NONE, Geometry::node_base_type); NodeType *type = NodeType::add("mesh", create, NodeType::NONE, Geometry::get_node_base_type());
SOCKET_INT_ARRAY(triangles, "Triangles", array<int>()); SOCKET_INT_ARRAY(triangles, "Triangles", array<int>());
SOCKET_POINT_ARRAY(verts, "Vertices", array<float3>()); SOCKET_POINT_ARRAY(verts, "Vertices", array<float3>());
@ -202,7 +202,7 @@ Mesh::Mesh(const NodeType *node_type, Type geom_type_)
patch_table = NULL; patch_table = NULL;
} }
Mesh::Mesh() : Mesh(node_type, Geometry::MESH) Mesh::Mesh() : Mesh(get_node_type(), Geometry::MESH)
{ {
} }

180
intern/cycles/render/nodes.cpp
View File

@ -258,7 +258,7 @@ NODE_DEFINE(ImageTextureNode)
return type; return type;
} }
ImageTextureNode::ImageTextureNode() : ImageSlotTextureNode(node_type) ImageTextureNode::ImageTextureNode() : ImageSlotTextureNode(get_node_type())
{ {
colorspace = u_colorspace_raw; colorspace = u_colorspace_raw;
animated = false; animated = false;
@ -309,11 +309,11 @@ void ImageTextureNode::cull_tiles(Scene *scene, ShaderGraph *graph)
ustring attribute; ustring attribute;
if (vector_in->link) { if (vector_in->link) {
ShaderNode *node = vector_in->link->parent; ShaderNode *node = vector_in->link->parent;
if (node->type == UVMapNode::node_type) { if (node->type == UVMapNode::get_node_type()) {
UVMapNode *uvmap = (UVMapNode *)node; UVMapNode *uvmap = (UVMapNode *)node;
attribute = uvmap->get_attribute(); attribute = uvmap->get_attribute();
} }
else if (node->type == TextureCoordinateNode::node_type) { else if (node->type == TextureCoordinateNode::get_node_type()) {
if (vector_in->link != node->output("UV")) { if (vector_in->link != node->output("UV")) {
return; return;
} }
@ -525,7 +525,7 @@ NODE_DEFINE(EnvironmentTextureNode)
return type; return type;
} }
EnvironmentTextureNode::EnvironmentTextureNode() : ImageSlotTextureNode(node_type) EnvironmentTextureNode::EnvironmentTextureNode() : ImageSlotTextureNode(get_node_type())
{ {
colorspace = u_colorspace_raw; colorspace = u_colorspace_raw;
animated = false; animated = false;
@ -818,7 +818,7 @@ NODE_DEFINE(SkyTextureNode)
return type; return type;
} }
SkyTextureNode::SkyTextureNode() : TextureNode(node_type) SkyTextureNode::SkyTextureNode() : TextureNode(get_node_type())
{ {
} }
@ -1000,7 +1000,7 @@ NODE_DEFINE(GradientTextureNode)
return type; return type;
} }
GradientTextureNode::GradientTextureNode() : TextureNode(node_type) GradientTextureNode::GradientTextureNode() : TextureNode(get_node_type())
{ {
} }
@ -1057,7 +1057,7 @@ NODE_DEFINE(NoiseTextureNode)
return type; return type;
} }
NoiseTextureNode::NoiseTextureNode() : TextureNode(node_type) NoiseTextureNode::NoiseTextureNode() : TextureNode(get_node_type())
{ {
} }
@ -1150,7 +1150,7 @@ NODE_DEFINE(VoronoiTextureNode)
return type; return type;
} }
VoronoiTextureNode::VoronoiTextureNode() : TextureNode(node_type) VoronoiTextureNode::VoronoiTextureNode() : TextureNode(get_node_type())
{ {
} }
@ -1229,7 +1229,7 @@ NODE_DEFINE(IESLightNode)
return type; return type;
} }
IESLightNode::IESLightNode() : TextureNode(node_type) IESLightNode::IESLightNode() : TextureNode(get_node_type())
{ {
light_manager = NULL; light_manager = NULL;
slot = -1; slot = -1;
@ -1321,7 +1321,7 @@ NODE_DEFINE(WhiteNoiseTextureNode)
return type; return type;
} }
WhiteNoiseTextureNode::WhiteNoiseTextureNode() : ShaderNode(node_type) WhiteNoiseTextureNode::WhiteNoiseTextureNode() : ShaderNode(get_node_type())
{ {
} }
@ -1386,7 +1386,7 @@ NODE_DEFINE(MusgraveTextureNode)
return type; return type;
} }
MusgraveTextureNode::MusgraveTextureNode() : TextureNode(node_type) MusgraveTextureNode::MusgraveTextureNode() : TextureNode(get_node_type())
{ {
} }
@ -1484,7 +1484,7 @@ NODE_DEFINE(WaveTextureNode)
return type; return type;
} }
WaveTextureNode::WaveTextureNode() : TextureNode(node_type) WaveTextureNode::WaveTextureNode() : TextureNode(get_node_type())
{ {
} }
@ -1558,7 +1558,7 @@ NODE_DEFINE(MagicTextureNode)
return type; return type;
} }
MagicTextureNode::MagicTextureNode() : TextureNode(node_type) MagicTextureNode::MagicTextureNode() : TextureNode(get_node_type())
{ {
} }
@ -1611,7 +1611,7 @@ NODE_DEFINE(CheckerTextureNode)
return type; return type;
} }
CheckerTextureNode::CheckerTextureNode() : TextureNode(node_type) CheckerTextureNode::CheckerTextureNode() : TextureNode(get_node_type())
{ {
} }
@ -1677,7 +1677,7 @@ NODE_DEFINE(BrickTextureNode)
return type; return type;
} }
BrickTextureNode::BrickTextureNode() : TextureNode(node_type) BrickTextureNode::BrickTextureNode() : TextureNode(get_node_type())
{ {
} }
@ -1770,7 +1770,7 @@ NODE_DEFINE(PointDensityTextureNode)
return type; return type;
} }
PointDensityTextureNode::PointDensityTextureNode() : ShaderNode(node_type) PointDensityTextureNode::PointDensityTextureNode() : ShaderNode(get_node_type())
{ {
} }
@ -1887,7 +1887,7 @@ NODE_DEFINE(NormalNode)
return type; return type;
} }
NormalNode::NormalNode() : ShaderNode(node_type) NormalNode::NormalNode() : ShaderNode(get_node_type())
{ {
} }
@ -1934,7 +1934,7 @@ NODE_DEFINE(MappingNode)
return type; return type;
} }
MappingNode::MappingNode() : ShaderNode(node_type) MappingNode::MappingNode() : ShaderNode(get_node_type())
{ {
} }
@ -1989,7 +1989,7 @@ NODE_DEFINE(RGBToBWNode)
return type; return type;
} }
RGBToBWNode::RGBToBWNode() : ShaderNode(node_type) RGBToBWNode::RGBToBWNode() : ShaderNode(get_node_type())
{ {
} }
@ -2312,7 +2312,7 @@ NODE_DEFINE(AnisotropicBsdfNode)
return type; return type;
} }
AnisotropicBsdfNode::AnisotropicBsdfNode() : BsdfNode(node_type) AnisotropicBsdfNode::AnisotropicBsdfNode() : BsdfNode(get_node_type())
{ {
closure = CLOSURE_BSDF_MICROFACET_GGX_ID; closure = CLOSURE_BSDF_MICROFACET_GGX_ID;
} }
@ -2370,7 +2370,7 @@ NODE_DEFINE(GlossyBsdfNode)
return type; return type;
} }
GlossyBsdfNode::GlossyBsdfNode() : BsdfNode(node_type) GlossyBsdfNode::GlossyBsdfNode() : BsdfNode(get_node_type())
{ {
closure = CLOSURE_BSDF_MICROFACET_GGX_ID; closure = CLOSURE_BSDF_MICROFACET_GGX_ID;
distribution_orig = NBUILTIN_CLOSURES; distribution_orig = NBUILTIN_CLOSURES;
@ -2463,7 +2463,7 @@ NODE_DEFINE(GlassBsdfNode)
return type; return type;
} }
GlassBsdfNode::GlassBsdfNode() : BsdfNode(node_type) GlassBsdfNode::GlassBsdfNode() : BsdfNode(get_node_type())
{ {
closure = CLOSURE_BSDF_SHARP_GLASS_ID; closure = CLOSURE_BSDF_SHARP_GLASS_ID;
distribution_orig = NBUILTIN_CLOSURES; distribution_orig = NBUILTIN_CLOSURES;
@ -2556,7 +2556,7 @@ NODE_DEFINE(RefractionBsdfNode)
return type; return type;
} }
RefractionBsdfNode::RefractionBsdfNode() : BsdfNode(node_type) RefractionBsdfNode::RefractionBsdfNode() : BsdfNode(get_node_type())
{ {
closure = CLOSURE_BSDF_REFRACTION_ID; closure = CLOSURE_BSDF_REFRACTION_ID;
distribution_orig = NBUILTIN_CLOSURES; distribution_orig = NBUILTIN_CLOSURES;
@ -2644,7 +2644,7 @@ NODE_DEFINE(ToonBsdfNode)
return type; return type;
} }
ToonBsdfNode::ToonBsdfNode() : BsdfNode(node_type) ToonBsdfNode::ToonBsdfNode() : BsdfNode(get_node_type())
{ {
closure = CLOSURE_BSDF_DIFFUSE_TOON_ID; closure = CLOSURE_BSDF_DIFFUSE_TOON_ID;
} }
@ -2678,7 +2678,7 @@ NODE_DEFINE(VelvetBsdfNode)
return type; return type;
} }
VelvetBsdfNode::VelvetBsdfNode() : BsdfNode(node_type) VelvetBsdfNode::VelvetBsdfNode() : BsdfNode(get_node_type())
{ {
closure = CLOSURE_BSDF_ASHIKHMIN_VELVET_ID; closure = CLOSURE_BSDF_ASHIKHMIN_VELVET_ID;
} }
@ -2709,7 +2709,7 @@ NODE_DEFINE(DiffuseBsdfNode)
return type; return type;
} }
DiffuseBsdfNode::DiffuseBsdfNode() : BsdfNode(node_type) DiffuseBsdfNode::DiffuseBsdfNode() : BsdfNode(get_node_type())
{ {
closure = CLOSURE_BSDF_DIFFUSE_ID; closure = CLOSURE_BSDF_DIFFUSE_ID;
} }
@ -2773,7 +2773,7 @@ NODE_DEFINE(PrincipledBsdfNode)
return type; return type;
} }
PrincipledBsdfNode::PrincipledBsdfNode() : BsdfBaseNode(node_type) PrincipledBsdfNode::PrincipledBsdfNode() : BsdfBaseNode(get_node_type())
{ {
closure = CLOSURE_BSDF_PRINCIPLED_ID; closure = CLOSURE_BSDF_PRINCIPLED_ID;
distribution = CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID; distribution = CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID;
@ -2994,7 +2994,7 @@ NODE_DEFINE(TranslucentBsdfNode)
return type; return type;
} }
TranslucentBsdfNode::TranslucentBsdfNode() : BsdfNode(node_type) TranslucentBsdfNode::TranslucentBsdfNode() : BsdfNode(get_node_type())
{ {
closure = CLOSURE_BSDF_TRANSLUCENT_ID; closure = CLOSURE_BSDF_TRANSLUCENT_ID;
} }
@ -3023,7 +3023,7 @@ NODE_DEFINE(TransparentBsdfNode)
return type; return type;
} }
TransparentBsdfNode::TransparentBsdfNode() : BsdfNode(node_type) TransparentBsdfNode::TransparentBsdfNode() : BsdfNode(get_node_type())
{ {
closure = CLOSURE_BSDF_TRANSPARENT_ID; closure = CLOSURE_BSDF_TRANSPARENT_ID;
} }
@ -3064,7 +3064,7 @@ NODE_DEFINE(SubsurfaceScatteringNode)
return type; return type;
} }
SubsurfaceScatteringNode::SubsurfaceScatteringNode() : BsdfNode(node_type) SubsurfaceScatteringNode::SubsurfaceScatteringNode() : BsdfNode(get_node_type())
{ {
closure = falloff; closure = falloff;
} }
@ -3106,7 +3106,7 @@ NODE_DEFINE(EmissionNode)
return type; return type;
} }
EmissionNode::EmissionNode() : ShaderNode(node_type) EmissionNode::EmissionNode() : ShaderNode(get_node_type())
{ {
} }
@ -3155,7 +3155,7 @@ NODE_DEFINE(BackgroundNode)
return type; return type;
} }
BackgroundNode::BackgroundNode() : ShaderNode(node_type) BackgroundNode::BackgroundNode() : ShaderNode(get_node_type())
{ {
} }
@ -3203,7 +3203,7 @@ NODE_DEFINE(HoldoutNode)
return type; return type;
} }
HoldoutNode::HoldoutNode() : ShaderNode(node_type) HoldoutNode::HoldoutNode() : ShaderNode(get_node_type())
{ {
} }
@ -3241,7 +3241,7 @@ NODE_DEFINE(AmbientOcclusionNode)
return type; return type;
} }
AmbientOcclusionNode::AmbientOcclusionNode() : ShaderNode(node_type) AmbientOcclusionNode::AmbientOcclusionNode() : ShaderNode(get_node_type())
{ {
} }
@ -3329,7 +3329,7 @@ NODE_DEFINE(AbsorptionVolumeNode)
return type; return type;
} }
AbsorptionVolumeNode::AbsorptionVolumeNode() : VolumeNode(node_type) AbsorptionVolumeNode::AbsorptionVolumeNode() : VolumeNode(get_node_type())
{ {
closure = CLOSURE_VOLUME_ABSORPTION_ID; closure = CLOSURE_VOLUME_ABSORPTION_ID;
} }
@ -3360,7 +3360,7 @@ NODE_DEFINE(ScatterVolumeNode)
return type; return type;
} }
ScatterVolumeNode::ScatterVolumeNode() : VolumeNode(node_type) ScatterVolumeNode::ScatterVolumeNode() : VolumeNode(get_node_type())
{ {
closure = CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID; closure = CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID;
} }
@ -3401,7 +3401,7 @@ NODE_DEFINE(PrincipledVolumeNode)
return type; return type;
} }
PrincipledVolumeNode::PrincipledVolumeNode() : VolumeNode(node_type) PrincipledVolumeNode::PrincipledVolumeNode() : VolumeNode(get_node_type())
{ {
closure = CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID; closure = CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID;
density_attribute = ustring("density"); density_attribute = ustring("density");
@ -3526,7 +3526,7 @@ NODE_DEFINE(PrincipledHairBsdfNode)
return type; return type;
} }
PrincipledHairBsdfNode::PrincipledHairBsdfNode() : BsdfBaseNode(node_type) PrincipledHairBsdfNode::PrincipledHairBsdfNode() : BsdfBaseNode(get_node_type())
{ {
closure = CLOSURE_BSDF_HAIR_PRINCIPLED_ID; closure = CLOSURE_BSDF_HAIR_PRINCIPLED_ID;
} }
@ -3637,7 +3637,7 @@ NODE_DEFINE(HairBsdfNode)
return type; return type;
} }
HairBsdfNode::HairBsdfNode() : BsdfNode(node_type) HairBsdfNode::HairBsdfNode() : BsdfNode(get_node_type())
{ {
closure = CLOSURE_BSDF_HAIR_REFLECTION_ID; closure = CLOSURE_BSDF_HAIR_REFLECTION_ID;
} }
@ -3677,7 +3677,7 @@ NODE_DEFINE(GeometryNode)
return type; return type;
} }
GeometryNode::GeometryNode() : ShaderNode(node_type) GeometryNode::GeometryNode() : ShaderNode(get_node_type())
{ {
special_type = SHADER_SPECIAL_TYPE_GEOMETRY; special_type = SHADER_SPECIAL_TYPE_GEOMETRY;
} }
@ -3824,7 +3824,7 @@ NODE_DEFINE(TextureCoordinateNode)
return type; return type;
} }
TextureCoordinateNode::TextureCoordinateNode() : ShaderNode(node_type) TextureCoordinateNode::TextureCoordinateNode() : ShaderNode(get_node_type())
{ {
} }
@ -3971,7 +3971,7 @@ NODE_DEFINE(UVMapNode)
return type; return type;
} }
UVMapNode::UVMapNode() : ShaderNode(node_type) UVMapNode::UVMapNode() : ShaderNode(get_node_type())
{ {
} }
@ -4060,7 +4060,7 @@ NODE_DEFINE(LightPathNode)
return type; return type;
} }
LightPathNode::LightPathNode() : ShaderNode(node_type) LightPathNode::LightPathNode() : ShaderNode(get_node_type())
{ {
} }
@ -4160,7 +4160,7 @@ NODE_DEFINE(LightFalloffNode)
return type; return type;
} }
LightFalloffNode::LightFalloffNode() : ShaderNode(node_type) LightFalloffNode::LightFalloffNode() : ShaderNode(get_node_type())
{ {
} }
@ -4217,7 +4217,7 @@ NODE_DEFINE(ObjectInfoNode)
return type; return type;
} }
ObjectInfoNode::ObjectInfoNode() : ShaderNode(node_type) ObjectInfoNode::ObjectInfoNode() : ShaderNode(get_node_type())
{ {
} }
@ -4275,7 +4275,7 @@ NODE_DEFINE(ParticleInfoNode)
return type; return type;
} }
ParticleInfoNode::ParticleInfoNode() : ShaderNode(node_type) ParticleInfoNode::ParticleInfoNode() : ShaderNode(get_node_type())
{ {
} }
@ -4382,7 +4382,7 @@ NODE_DEFINE(HairInfoNode)
return type; return type;
} }
HairInfoNode::HairInfoNode() : ShaderNode(node_type) HairInfoNode::HairInfoNode() : ShaderNode(get_node_type())
{ {
} }
@ -4457,7 +4457,7 @@ NODE_DEFINE(VolumeInfoNode)
return type; return type;
} }
VolumeInfoNode::VolumeInfoNode() : ShaderNode(node_type) VolumeInfoNode::VolumeInfoNode() : ShaderNode(get_node_type())
{ {
} }
@ -4538,7 +4538,7 @@ NODE_DEFINE(VertexColorNode)
return type; return type;
} }
VertexColorNode::VertexColorNode() : ShaderNode(node_type) VertexColorNode::VertexColorNode() : ShaderNode(get_node_type())
{ {
} }
@ -4619,7 +4619,7 @@ NODE_DEFINE(ValueNode)
return type; return type;
} }
ValueNode::ValueNode() : ShaderNode(node_type) ValueNode::ValueNode() : ShaderNode(get_node_type())
{ {
} }
@ -4653,7 +4653,7 @@ NODE_DEFINE(ColorNode)
return type; return type;
} }
ColorNode::ColorNode() : ShaderNode(node_type) ColorNode::ColorNode() : ShaderNode(get_node_type())
{ {
} }
@ -4692,7 +4692,7 @@ NODE_DEFINE(AddClosureNode)
return type; return type;
} }
AddClosureNode::AddClosureNode() : ShaderNode(node_type) AddClosureNode::AddClosureNode() : ShaderNode(get_node_type())
{ {
special_type = SHADER_SPECIAL_TYPE_COMBINE_CLOSURE; special_type = SHADER_SPECIAL_TYPE_COMBINE_CLOSURE;
} }
@ -4736,7 +4736,7 @@ NODE_DEFINE(MixClosureNode)
return type; return type;
} }
MixClosureNode::MixClosureNode() : ShaderNode(node_type) MixClosureNode::MixClosureNode() : ShaderNode(get_node_type())
{ {
special_type = SHADER_SPECIAL_TYPE_COMBINE_CLOSURE; special_type = SHADER_SPECIAL_TYPE_COMBINE_CLOSURE;
} }
@ -4790,7 +4790,7 @@ NODE_DEFINE(MixClosureWeightNode)
return type; return type;
} }
MixClosureWeightNode::MixClosureWeightNode() : ShaderNode(node_type) MixClosureWeightNode::MixClosureWeightNode() : ShaderNode(get_node_type())
{ {
} }
@ -4827,7 +4827,7 @@ NODE_DEFINE(InvertNode)
return type; return type;
} }
InvertNode::InvertNode() : ShaderNode(node_type) InvertNode::InvertNode() : ShaderNode(get_node_type())
{ {
} }
@ -4903,7 +4903,7 @@ NODE_DEFINE(MixNode)
return type; return type;
} }
MixNode::MixNode() : ShaderNode(node_type) MixNode::MixNode() : ShaderNode(get_node_type())
{ {
} }
@ -4958,7 +4958,7 @@ NODE_DEFINE(CombineRGBNode)
return type; return type;
} }
CombineRGBNode::CombineRGBNode() : ShaderNode(node_type) CombineRGBNode::CombineRGBNode() : ShaderNode(get_node_type())
{ {
} }
@ -5006,7 +5006,7 @@ NODE_DEFINE(CombineXYZNode)
return type; return type;
} }
CombineXYZNode::CombineXYZNode() : ShaderNode(node_type) CombineXYZNode::CombineXYZNode() : ShaderNode(get_node_type())
{ {
} }
@ -5054,7 +5054,7 @@ NODE_DEFINE(CombineHSVNode)
return type; return type;
} }
CombineHSVNode::CombineHSVNode() : ShaderNode(node_type) CombineHSVNode::CombineHSVNode() : ShaderNode(get_node_type())
{ {
} }
@ -5097,7 +5097,7 @@ NODE_DEFINE(GammaNode)
return type; return type;
} }
GammaNode::GammaNode() : ShaderNode(node_type) GammaNode::GammaNode() : ShaderNode(get_node_type())
{ {
} }
@ -5153,7 +5153,7 @@ NODE_DEFINE(BrightContrastNode)
return type; return type;
} }
BrightContrastNode::BrightContrastNode() : ShaderNode(node_type) BrightContrastNode::BrightContrastNode() : ShaderNode(get_node_type())
{ {
} }
@ -5198,7 +5198,7 @@ NODE_DEFINE(SeparateRGBNode)
return type; return type;
} }
SeparateRGBNode::SeparateRGBNode() : ShaderNode(node_type) SeparateRGBNode::SeparateRGBNode() : ShaderNode(get_node_type())
{ {
} }
@ -5251,7 +5251,7 @@ NODE_DEFINE(SeparateXYZNode)
return type; return type;
} }
SeparateXYZNode::SeparateXYZNode() : ShaderNode(node_type) SeparateXYZNode::SeparateXYZNode() : ShaderNode(get_node_type())
{ {
} }
@ -5304,7 +5304,7 @@ NODE_DEFINE(SeparateHSVNode)
return type; return type;
} }
SeparateHSVNode::SeparateHSVNode() : ShaderNode(node_type) SeparateHSVNode::SeparateHSVNode() : ShaderNode(get_node_type())
{ {
} }
@ -5358,7 +5358,7 @@ NODE_DEFINE(HSVNode)
return type; return type;
} }
HSVNode::HSVNode() : ShaderNode(node_type) HSVNode::HSVNode() : ShaderNode(get_node_type())
{ {
} }
@ -5401,7 +5401,7 @@ NODE_DEFINE(AttributeNode)
return type; return type;
} }
AttributeNode::AttributeNode() : ShaderNode(node_type) AttributeNode::AttributeNode() : ShaderNode(get_node_type())
{ {
} }
@ -5489,7 +5489,7 @@ NODE_DEFINE(CameraNode)
return type; return type;
} }
CameraNode::CameraNode() : ShaderNode(node_type) CameraNode::CameraNode() : ShaderNode(get_node_type())
{ {
} }
@ -5525,7 +5525,7 @@ NODE_DEFINE(FresnelNode)
return type; return type;
} }
FresnelNode::FresnelNode() : ShaderNode(node_type) FresnelNode::FresnelNode() : ShaderNode(get_node_type())
{ {
} }
@ -5563,7 +5563,7 @@ NODE_DEFINE(LayerWeightNode)
return type; return type;
} }
LayerWeightNode::LayerWeightNode() : ShaderNode(node_type) LayerWeightNode::LayerWeightNode() : ShaderNode(get_node_type())
{ {
} }
@ -5611,7 +5611,7 @@ NODE_DEFINE(WireframeNode)
return type; return type;
} }
WireframeNode::WireframeNode() : ShaderNode(node_type) WireframeNode::WireframeNode() : ShaderNode(get_node_type())
{ {
} }
@ -5659,7 +5659,7 @@ NODE_DEFINE(WavelengthNode)
return type; return type;
} }
WavelengthNode::WavelengthNode() : ShaderNode(node_type) WavelengthNode::WavelengthNode() : ShaderNode(get_node_type())
{ {
} }
@ -5689,7 +5689,7 @@ NODE_DEFINE(BlackbodyNode)
return type; return type;
} }
BlackbodyNode::BlackbodyNode() : ShaderNode(node_type) BlackbodyNode::BlackbodyNode() : ShaderNode(get_node_type())
{ {
} }
@ -5728,7 +5728,7 @@ NODE_DEFINE(OutputNode)
return type; return type;
} }
OutputNode::OutputNode() : ShaderNode(node_type) OutputNode::OutputNode() : ShaderNode(get_node_type())
{ {
special_type = SHADER_SPECIAL_TYPE_OUTPUT; special_type = SHADER_SPECIAL_TYPE_OUTPUT;
} }
@ -5780,7 +5780,7 @@ NODE_DEFINE(MapRangeNode)
return type; return type;
} }
MapRangeNode::MapRangeNode() : ShaderNode(node_type) MapRangeNode::MapRangeNode() : ShaderNode(get_node_type())
{ {
} }
@ -5868,7 +5868,7 @@ NODE_DEFINE(ClampNode)
return type; return type;
} }
ClampNode::ClampNode() : ShaderNode(node_type) ClampNode::ClampNode() : ShaderNode(get_node_type())
{ {
} }
@ -5923,7 +5923,7 @@ NODE_DEFINE(OutputAOVNode)
return type; return type;
} }
OutputAOVNode::OutputAOVNode() : ShaderNode(node_type) OutputAOVNode::OutputAOVNode() : ShaderNode(get_node_type())
{ {
special_type = SHADER_SPECIAL_TYPE_OUTPUT_AOV; special_type = SHADER_SPECIAL_TYPE_OUTPUT_AOV;
slot = -1; slot = -1;
@ -6021,7 +6021,7 @@ NODE_DEFINE(MathNode)
return type; return type;
} }
MathNode::MathNode() : ShaderNode(node_type) MathNode::MathNode() : ShaderNode(get_node_type())
{ {
} }
@ -6124,7 +6124,7 @@ NODE_DEFINE(VectorMathNode)
return type; return type;
} }
VectorMathNode::VectorMathNode() : ShaderNode(node_type) VectorMathNode::VectorMathNode() : ShaderNode(get_node_type())
{ {
} }
@ -6213,7 +6213,7 @@ NODE_DEFINE(VectorRotateNode)
return type; return type;
} }
VectorRotateNode::VectorRotateNode() : ShaderNode(node_type) VectorRotateNode::VectorRotateNode() : ShaderNode(get_node_type())
{ {
} }
@ -6269,7 +6269,7 @@ NODE_DEFINE(VectorTransformNode)
return type; return type;
} }
VectorTransformNode::VectorTransformNode() : ShaderNode(node_type) VectorTransformNode::VectorTransformNode() : ShaderNode(get_node_type())
{ {
} }
@ -6317,7 +6317,7 @@ NODE_DEFINE(BumpNode)
return type; return type;
} }
BumpNode::BumpNode() : ShaderNode(node_type) BumpNode::BumpNode() : ShaderNode(get_node_type())
{ {
special_type = SHADER_SPECIAL_TYPE_BUMP; special_type = SHADER_SPECIAL_TYPE_BUMP;
} }
@ -6464,7 +6464,7 @@ NODE_DEFINE(RGBCurvesNode)
return type; return type;
} }
RGBCurvesNode::RGBCurvesNode() : CurvesNode(node_type) RGBCurvesNode::RGBCurvesNode() : CurvesNode(get_node_type())
{ {
} }
@ -6501,7 +6501,7 @@ NODE_DEFINE(VectorCurvesNode)
return type; return type;
} }
VectorCurvesNode::VectorCurvesNode() : CurvesNode(node_type) VectorCurvesNode::VectorCurvesNode() : CurvesNode(get_node_type())
{ {
} }
@ -6538,7 +6538,7 @@ NODE_DEFINE(RGBRampNode)
return type; return type;
} }
RGBRampNode::RGBRampNode() : ShaderNode(node_type) RGBRampNode::RGBRampNode() : ShaderNode(get_node_type())
{ {
} }
@ -6611,7 +6611,7 @@ NODE_DEFINE(SetNormalNode)
return type; return type;
} }
SetNormalNode::SetNormalNode() : ShaderNode(node_type) SetNormalNode::SetNormalNode() : ShaderNode(get_node_type())
{ {
} }
@ -6733,7 +6733,7 @@ NODE_DEFINE(NormalMapNode)
return type; return type;
} }
NormalMapNode::NormalMapNode() : ShaderNode(node_type) NormalMapNode::NormalMapNode() : ShaderNode(get_node_type())
{ {
} }
@ -6827,7 +6827,7 @@ NODE_DEFINE(TangentNode)
return type; return type;
} }
TangentNode::TangentNode() : ShaderNode(node_type) TangentNode::TangentNode() : ShaderNode(get_node_type())
{ {
} }
@ -6897,7 +6897,7 @@ NODE_DEFINE(BevelNode)
return type; return type;
} }
BevelNode::BevelNode() : ShaderNode(node_type) BevelNode::BevelNode() : ShaderNode(get_node_type())
{ {
} }
@ -6942,7 +6942,7 @@ NODE_DEFINE(DisplacementNode)
return type; return type;
} }
DisplacementNode::DisplacementNode() : ShaderNode(node_type) DisplacementNode::DisplacementNode() : ShaderNode(get_node_type())
{ {
} }
@ -7001,7 +7001,7 @@ NODE_DEFINE(VectorDisplacementNode)
return type; return type;
} }
VectorDisplacementNode::VectorDisplacementNode() : ShaderNode(node_type) VectorDisplacementNode::VectorDisplacementNode() : ShaderNode(get_node_type())
{ {
} }

6
intern/cycles/render/object.cpp
View File

@ -82,7 +82,7 @@ NODE_DEFINE(Object)
{ {
NodeType *type = NodeType::add("object", create); NodeType *type = NodeType::add("object", create);
SOCKET_NODE(geometry, "Geometry", &Geometry::node_base_type); SOCKET_NODE(geometry, "Geometry", Geometry::get_node_base_type());
SOCKET_TRANSFORM(tfm, "Transform", transform_identity()); SOCKET_TRANSFORM(tfm, "Transform", transform_identity());
SOCKET_UINT(visibility, "Visibility", ~0); SOCKET_UINT(visibility, "Visibility", ~0);
SOCKET_COLOR(color, "Color", zero_float3()); SOCKET_COLOR(color, "Color", zero_float3());
@ -98,13 +98,13 @@ NODE_DEFINE(Object)
SOCKET_BOOLEAN(is_shadow_catcher, "Shadow Catcher", false); SOCKET_BOOLEAN(is_shadow_catcher, "Shadow Catcher", false);
SOCKET_NODE(particle_system, "Particle System", &ParticleSystem::node_type); SOCKET_NODE(particle_system, "Particle System", ParticleSystem::get_node_type());
SOCKET_INT(particle_index, "Particle Index", 0); SOCKET_INT(particle_index, "Particle Index", 0);
return type; return type;
} }
Object::Object() : Node(node_type) Object::Object() : Node(get_node_type())
{ {
particle_system = NULL; particle_system = NULL;
particle_index = 0; particle_index = 0;

2
intern/cycles/render/particles.cpp
View File

@ -36,7 +36,7 @@ NODE_DEFINE(ParticleSystem)
return type; return type;
} }
ParticleSystem::ParticleSystem() : Node(node_type) ParticleSystem::ParticleSystem() : Node(get_node_type())
{ {
} }

6
intern/cycles/render/shader.cpp
View File

@ -194,7 +194,7 @@ NODE_DEFINE(Shader)
return type; return type;
} }
Shader::Shader() : Node(node_type) Shader::Shader() : Node(get_node_type())
{ {
pass_id = 0; pass_id = 0;
@ -245,7 +245,7 @@ bool Shader::is_constant_emission(float3 *emission)
return false; return false;
} }
if (surf->link->parent->type == EmissionNode::node_type) { if (surf->link->parent->type == EmissionNode::get_node_type()) {
EmissionNode *node = (EmissionNode *)surf->link->parent; EmissionNode *node = (EmissionNode *)surf->link->parent;
assert(node->input("Color")); assert(node->input("Color"));
@ -257,7 +257,7 @@ bool Shader::is_constant_emission(float3 *emission)
*emission = node->get_color() * node->get_strength(); *emission = node->get_color() * node->get_strength();
} }
else if (surf->link->parent->type == BackgroundNode::node_type) { else if (surf->link->parent->type == BackgroundNode::get_node_type()) {
BackgroundNode *node = (BackgroundNode *)surf->link->parent; BackgroundNode *node = (BackgroundNode *)surf->link->parent;
assert(node->input("Color")); assert(node->input("Color"));

4
intern/cycles/render/volume.cpp
View File

@ -36,7 +36,7 @@ CCL_NAMESPACE_BEGIN
NODE_DEFINE(Volume) NODE_DEFINE(Volume)
{ {
NodeType *type = NodeType::add("volume", create, NodeType::NONE, Mesh::node_type); NodeType *type = NodeType::add("volume", create, NodeType::NONE, Mesh::get_node_type());
SOCKET_FLOAT(clipping, "Clipping", 0.001f); SOCKET_FLOAT(clipping, "Clipping", 0.001f);
SOCKET_FLOAT(step_size, "Step Size", 0.0f); SOCKET_FLOAT(step_size, "Step Size", 0.0f);
@ -45,7 +45,7 @@ NODE_DEFINE(Volume)
return type; return type;
} }
Volume::Volume() : Mesh(node_type, Geometry::VOLUME) Volume::Volume() : Mesh(get_node_type(), Geometry::VOLUME)
{ {
clipping = 0.001f; clipping = 0.001f;
step_size = 0.0f; step_size = 0.0f;