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

Fix T87317: Cycles XML parsing broken after bugfix for initialization order

Browse Source
This commit is contained in:
Brecht Van Lommel 2021-04-29 19:07:08 +02:00
parent b4f0d52473
commit 39226cd437
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,16 +148,17 @@ struct NodeType {
#define NODE_DECLARE \ #define NODE_DECLARE \
static const NodeType *get_node_type(); \ 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() \ const NodeType *structname::get_node_type() \
{ \ { \
static const NodeType *node_type = register_type<structname>(); \
return node_type; \ return node_type; \
} \ } \
template<typename T> const NodeType *structname::register_type() template<typename T> const NodeType *structname::register_type()
@ -169,6 +170,8 @@ struct NodeType {
#define NODE_ABSTRACT_DEFINE(structname) \ #define NODE_ABSTRACT_DEFINE(structname) \
const NodeType *structname::get_node_base_type() \ const NodeType *structname::get_node_base_type() \
{ \ { \
/* Base types constructed in this getter to ensure correct initialization \
* order. Regular types are not so they are auto-registered for XML parsing. */ \
static const NodeType *node_base_type = register_base_type<structname>(); \ static const NodeType *node_base_type = register_base_type<structname>(); \
return node_base_type; \ return node_base_type; \
} \ } \