bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Removed the group_tree_idname property from node types. This was a bit of a hack to associate node group types to specific tree types for node group operators. Since the node group operators now work independent from this property (see r56183) that property is no longer needed and just pollutes the bNodeType struct.

Browse Source
This commit is contained in:
Lukas Toenne 2013-04-20 17:57:45 +00:00
parent 01f8b229c9
commit c66acbf3d9
5 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,14 +222,6 @@ typedef struct bNodeType {
/* gpu */
NodeGPUExecFunction gpufunc;
/* Group type static info
*
* XXX This data is needed by group operators. If these operators could be implemented completely in Python,
* the static data could instead be stored in Python classes and would need no special treatment.
* Due to the way group operators move nodes between data blocks this is currently not possible.
*/
char group_tree_idname[64]; /* tree type associated to the group node type */
/* RNA integration */
ExtensionRNA ext;
} bNodeType;

6
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -2722,12 +2722,6 @@ static void def_group(StructRNA *srna)
RNA_def_property_struct_type(prop, "PropertyGroup");
RNA_def_property_flag(prop, PROP_IDPROPERTY);
RNA_def_property_ui_text(prop, "Interface", "Interface socket data");
/* registration */
prop = RNA_def_property(srna, "bl_group_tree_idname", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "typeinfo->group_tree_idname");
RNA_def_property_flag(prop, PROP_REGISTER | PROP_NEVER_CLAMP);
RNA_def_property_ui_text(prop, "Group Tree Type", "");
}
static void def_frame(StructRNA *srna)

1
source/blender/nodes/composite/nodes/node_composite_common.c
View File

@ -61,7 +61,6 @@ void register_node_type_cmp_group(void)
node_type_size(&ntype, 120, 60, 200);
node_type_label(&ntype, node_group_label);
node_type_update(&ntype, NULL, node_group_verify);
strcpy(ntype.group_tree_idname, "CompositorNodeTree");
nodeRegisterType(&ntype);
}

1
source/blender/nodes/shader/nodes/node_shader_common.c
View File

@ -242,7 +242,6 @@ void register_node_type_sh_group(void)
node_type_size(&ntype, 120, 60, 200);
node_type_label(&ntype, node_group_label);
node_type_update(&ntype, NULL, node_group_verify);
strcpy(ntype.group_tree_idname, "ShaderNodeTree");
node_type_exec(&ntype, group_initexec, group_freeexec, group_execute);
node_type_gpu(&ntype, gpu_group_execute);

1
source/blender/nodes/texture/nodes/node_texture_common.c
View File

@ -169,7 +169,6 @@ void register_node_type_tex_group(void)
node_type_size(&ntype, 120, 60, 200);
node_type_label(&ntype, node_group_label);
node_type_update(&ntype, NULL, node_group_verify);
strcpy(ntype.group_tree_idname, "TextureNodeTree");
node_type_exec(&ntype, group_initexec, group_freeexec, group_execute);
nodeRegisterType(&ntype);