griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #111142: bl_static_type is empty for node groups and custom nodes

Browse Source 
Caused by f18c45eb69.
Functions `node_type_base` and `node_type_base_custom`
are the same, but last one have been missed in the cleanup.

Pull Request: https://projects.blender.org/blender/blender/pulls/111154
This commit is contained in:
Iliya Katueshenock
2023-08-16 09:29:46 +02:00
committed by Jacques Lucke
parent a70953242d
commit f50da4040f
8 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_node.h
View File

@@ -755,6 +755,7 @@ bool nodeGroupPoll(const struct bNodeTree *nodetree,
void node_type_base_custom(struct bNodeType *ntype,
const char *idname,
const char *name,
const char *enum_name,
short nclass);
/**

2
source/blender/blenkernel/intern/node.cc
View File

@@ -4301,12 +4301,14 @@ void node_type_base(bNodeType *ntype, const int type, const char *name, const sh
void node_type_base_custom(bNodeType *ntype,
const char *idname,
const char *name,
const char *enum_name,
const short nclass)
{
STRNCPY(ntype->idname, idname);
ntype->type = NODE_CUSTOM;
STRNCPY(ntype->ui_name, name);
ntype->nclass = nclass;
ntype->enum_name_legacy = enum_name;
blender::bke::node_type_base_defaults(ntype);
}

2
source/blender/makesrna/intern/rna_nodetree.cc
View File

@@ -1794,7 +1794,7 @@ static bNodeType *rna_Node_register_base(Main *bmain,
/* setup dummy node & node type to store static properties in */
memset(&dummy_nt, 0, sizeof(bNodeType));
/* this does some additional initialization of default values */
node_type_base_custom(&dummy_nt, identifier, "", 0);
node_type_base_custom(&dummy_nt, identifier, "", "CUSTOM", 0);
memset(&dummy_node, 0, sizeof(bNode));
dummy_node.typeinfo = &dummy_nt;

2
source/blender/nodes/composite/nodes/node_composite_common.cc
View File

@@ -22,7 +22,7 @@ void register_node_type_cmp_group()
/* NOTE: Cannot use sh_node_type_base for node group, because it would map the node type
* to the shared NODE_GROUP integer type id. */
node_type_base_custom(&ntype, "CompositorNodeGroup", "Group", NODE_CLASS_GROUP);
node_type_base_custom(&ntype, "CompositorNodeGroup", "Group", "GROUP", NODE_CLASS_GROUP);
ntype.type = NODE_GROUP;
ntype.poll = cmp_node_poll_default;
ntype.poll_instance = node_group_poll_instance;

2
source/blender/nodes/geometry/nodes/node_geo_common.cc
View File

@@ -42,7 +42,7 @@ static void register_node_type_geo_group()
{
static bNodeType ntype;
node_type_base_custom(&ntype, "GeometryNodeGroup", "Group", NODE_CLASS_GROUP);
node_type_base_custom(&ntype, "GeometryNodeGroup", "Group", "GROUP", NODE_CLASS_GROUP);
ntype.type = NODE_GROUP;
ntype.poll = geo_node_poll_default;
ntype.poll_instance = node_group_poll_instance;

3
source/blender/nodes/intern/node_register.cc
View File

@@ -34,7 +34,8 @@ static void register_undefined_types()
STRNCPY(blender::bke::NodeTreeTypeUndefined.ui_name, N_("Undefined"));
STRNCPY(blender::bke::NodeTreeTypeUndefined.ui_description, N_("Undefined Node Tree Type"));
node_type_base_custom(&blender::bke::NodeTypeUndefined, "NodeUndefined", "Undefined", 0);
node_type_base_custom(
&blender::bke::NodeTypeUndefined, "NodeUndefined", "Undefined", "UNDEFINED", 0);
blender::bke::NodeTypeUndefined.poll = node_undefined_poll;
STRNCPY(blender::bke::NodeSocketTypeUndefined.idname, "NodeSocketUndefined");

2
source/blender/nodes/shader/nodes/node_shader_common.cc
View File

@@ -85,7 +85,7 @@ void register_node_type_sh_group()
/* NOTE: cannot use #sh_node_type_base for node group, because it would map the node type
* to the shared #NODE_GROUP integer type id. */
node_type_base_custom(&ntype, "ShaderNodeGroup", "Group", NODE_CLASS_GROUP);
node_type_base_custom(&ntype, "ShaderNodeGroup", "Group", "GROUP", NODE_CLASS_GROUP);
ntype.type = NODE_GROUP;
ntype.poll = sh_node_poll_default;
ntype.poll_instance = node_group_poll_instance;

2
source/blender/nodes/texture/nodes/node_texture_common.cc
View File

@@ -143,7 +143,7 @@ void register_node_type_tex_group()
/* NOTE: Cannot use #sh_node_type_base for node group, because it would map the node type
* to the shared #NODE_GROUP integer type id. */
node_type_base_custom(&ntype, "TextureNodeGroup", "Group", NODE_CLASS_GROUP);
node_type_base_custom(&ntype, "TextureNodeGroup", "Group", "GROUP", NODE_CLASS_GROUP);
ntype.type = NODE_GROUP;
ntype.poll = tex_node_poll_default;
ntype.poll_instance = node_group_poll_instance;