blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Cleanup: Define node tree icon in register function 

I suppose this was done to reduce then dependencies.
However, most nodes already depend on UI code so this isnt too useful.
This commit is contained in:
Aaron Carlisle 2021-12-24 22:47:58 -05:00
parent 6e0cf86e73
commit fc45b00720
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_node/drawnode.cc
View File

@ -1654,12 +1654,6 @@ void ED_node_init_butfuncs()
node_template_properties_update(ntype);
}
NODE_TYPES_END;
/* tree type icons */
ntreeType_Composite->ui_icon = ICON_NODE_COMPOSITING;
ntreeType_Shader->ui_icon = ICON_NODE_MATERIAL;
ntreeType_Texture->ui_icon = ICON_NODE_TEXTURE;
ntreeType_Geometry->ui_icon = ICON_NODETREE;
}
void ED_init_custom_node_type(bNodeType *UNUSED(ntype))

4
source/blender/nodes/composite/node_composite_tree.cc
View File

@ -36,6 +36,8 @@
#include "BKE_node_tree_update.h"
#include "BKE_tracking.h"
#include "UI_resources.h"
#include "node_common.h"
#include "node_util.h"
@ -202,7 +204,7 @@ void register_node_tree_type_cmp()
tt->type = NTREE_COMPOSIT;
strcpy(tt->idname, "CompositorNodeTree");
strcpy(tt->ui_name, N_("Compositor"));
tt->ui_icon = 0; /* Defined in `drawnode.c`. */
tt->ui_icon = ICON_NODE_COMPOSITING;
strcpy(tt->ui_description, N_("Compositing nodes"));
tt->free_cache = free_cache;

4
source/blender/nodes/geometry/node_geometry_tree.cc
View File

@ -32,6 +32,8 @@
#include "RNA_access.h"
#include "UI_resources.h"
#include "node_common.h"
bNodeTreeType *ntreeType_Geometry;
@ -121,7 +123,7 @@ void register_node_tree_type_geo()
tt->type = NTREE_GEOMETRY;
strcpy(tt->idname, "GeometryNodeTree");
strcpy(tt->ui_name, N_("Geometry Node Editor"));
tt->ui_icon = 0; /* Defined in `drawnode.c`. */
tt->ui_icon = ICON_NODETREE;
strcpy(tt->ui_description, N_("Geometry nodes"));
tt->rna_ext.srna = &RNA_GeometryNodeTree;
tt->update = geometry_node_tree_update;

1
source/blender/nodes/shader/CMakeLists.txt
View File

@ -26,6 +26,7 @@ set(INC
../../blenlib
../../blentranslation
../../depsgraph
../../editors/include
../../functions
../../gpu
../../imbuf

4
source/blender/nodes/shader/node_shader_tree.c
View File

@ -53,6 +53,8 @@
#include "RE_texture.h"
#include "UI_resources.h"
#include "NOD_common.h"
#include "node_common.h"
@ -183,7 +185,7 @@ void register_node_tree_type_sh(void)
tt->type = NTREE_SHADER;
strcpy(tt->idname, "ShaderNodeTree");
strcpy(tt->ui_name, N_("Shader Editor"));
tt->ui_icon = 0; /* Defined in `drawnode.c`. */
tt->ui_icon = ICON_NODE_MATERIAL;
strcpy(tt->ui_description, N_("Shader nodes"));
tt->foreach_nodeclass = foreach_nodeclass;

4
source/blender/nodes/texture/node_texture_tree.c
View File

@ -50,6 +50,8 @@
#include "RE_texture.h"
#include "UI_resources.h"
static void texture_get_from_context(const bContext *C,
bNodeTreeType *UNUSED(treetype),
bNodeTree **r_ntree,
@ -154,7 +156,7 @@ void register_node_tree_type_tex(void)
tt->type = NTREE_TEXTURE;
strcpy(tt->idname, "TextureNodeTree");
strcpy(tt->ui_name, N_("Texture Node Editor"));
tt->ui_icon = 0; /* Defined in `drawnode.c`. */
tt->ui_icon = ICON_NODE_TEXTURE; /* Defined in `drawnode.c`. */
strcpy(tt->ui_description, N_("Texture nodes"));
tt->foreach_nodeclass = foreach_nodeclass;