[Bf-blender-cvs] [120a38ccbe0] master: Nodes: Display bl_icon of custom nodes in node header

Jacques Lucke noreply at git.blender.org
Mon Mar 16 18:29:55 CET 2020


Commit: 120a38ccbe0ef4702cc35f9e0cfb841368913eec
Author: Jacques Lucke
Date:   Mon Mar 16 18:25:23 2020 +0100
Branches: master
https://developer.blender.org/rB120a38ccbe0ef4702cc35f9e0cfb841368913eec

Nodes: Display bl_icon of custom nodes in node header

This is D1578 by Philipp Oeser with small modifications.

===================================================================

M	source/blender/editors/space_node/node_draw.c

===================================================================

diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 35fbbad14b0..d2258db074d 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -1181,6 +1181,25 @@ static void node_draw_basis(const bContext *C,
     UI_but_func_set(but, node_toggle_button_cb, node, (void *)"NODE_OT_group_edit");
     UI_block_emboss_set(node->block, UI_EMBOSS);
   }
+  if (node->type == NODE_CUSTOM && node->typeinfo->ui_icon != ICON_NONE) {
+    iconofs -= iconbutw;
+    UI_block_emboss_set(node->block, UI_EMBOSS_NONE);
+    uiDefIconBut(node->block,
+                 UI_BTYPE_BUT,
+                 0,
+                 node->typeinfo->ui_icon,
+                 iconofs,
+                 rct->ymax - NODE_DY,
+                 iconbutw,
+                 UI_UNIT_Y,
+                 NULL,
+                 0,
+                 0,
+                 0,
+                 0,
+                 "");
+    UI_block_emboss_set(node->block, UI_EMBOSS);
+  }
 
   /* title */
   if (node->flag & SELECT) {



More information about the Bf-blender-cvs mailing list