From c66acbf3d990c4a4fbd535a796ba712abe11489b Mon Sep 17 00:00:00 2001 From: Lukas Toenne Date: Sat, 20 Apr 2013 17:57:45 +0000 Subject: [PATCH] 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. --- source/blender/blenkernel/BKE_node.h | 8 -------- source/blender/makesrna/intern/rna_nodetree.c | 6 ------ .../blender/nodes/composite/nodes/node_composite_common.c | 1 - source/blender/nodes/shader/nodes/node_shader_common.c | 1 - source/blender/nodes/texture/nodes/node_texture_common.c | 1 - 5 files changed, 17 deletions(-) diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index aca5d49824c..adef4853002 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -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; diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 11431e355a8..f7670560e20 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -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) diff --git a/source/blender/nodes/composite/nodes/node_composite_common.c b/source/blender/nodes/composite/nodes/node_composite_common.c index df1c5d3316b..df373f5e26a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_common.c +++ b/source/blender/nodes/composite/nodes/node_composite_common.c @@ -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); } diff --git a/source/blender/nodes/shader/nodes/node_shader_common.c b/source/blender/nodes/shader/nodes/node_shader_common.c index b1d77cc96ea..e5fe056856b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_common.c +++ b/source/blender/nodes/shader/nodes/node_shader_common.c @@ -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); diff --git a/source/blender/nodes/texture/nodes/node_texture_common.c b/source/blender/nodes/texture/nodes/node_texture_common.c index ee03323fb5d..d96042623b2 100644 --- a/source/blender/nodes/texture/nodes/node_texture_common.c +++ b/source/blender/nodes/texture/nodes/node_texture_common.c @@ -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);