Cleanup: Consistent names for draw callbacks in bNodeType.

[blender-staging.git] / source / blender / blenkernel / BKE_node.h

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 7f19a8670931762285b9cd714481a0b3c8b8bb52..6ede274b4c30f5d02a75331342f9a4cec3a85124 100644 (file)
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -162,24 +162,26 @@ typedef struct bNodeType {
        
        char storagename[64];                   /* struct name for DNA */
        
-       /// Main draw function for the node.
-       void (*drawfunc)(const struct bContext *C, struct ARegion *ar, struct SpaceNode *snode,
+       /* Main draw function for the node */
+       void (*draw_nodetype)(const struct bContext *C, struct ARegion *ar, struct SpaceNode *snode,
                         struct bNodeTree *ntree, struct bNode *node, bNodeInstanceKey key);
-       /// Updates the node geometry attributes according to internal state before actual drawing.
-       void (*drawupdatefunc)(const struct bContext *C, struct bNodeTree *ntree, struct bNode *node);
-       /// Draw the option buttons on the node.
-       void (*uifunc)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr);
-       /// Additional parameters in the side panel.
-       void (*uifuncbut)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr);
-       /// Additional drawing on backdrop.
-       void (*uibackdropfunc)(struct SpaceNode *snode, struct ImBuf *backdrop, struct bNode *node, int x, int y);
-
-       /// Draw a node socket. Default draws the input value button.
+       /* Updates the node geometry attributes according to internal state before actual drawing */
+       void (*draw_nodetype_prepare)(const struct bContext *C, struct bNodeTree *ntree, struct bNode *node);
+
+       /* Draw the option buttons on the node */
+       void (*draw_buttons)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr);
+       /* Additional parameters in the side panel */
+       void (*draw_buttons_ex)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr);
+
+       /* Additional drawing on backdrop */
+       void (*draw_backdrop)(struct SpaceNode *snode, struct ImBuf *backdrop, struct bNode *node, int x, int y);
+
+       /* Draw a node socket. Default draws the input value button. */
        /* XXX deprecated, only used for the OutputFile node,
         * should be removed at some point.
         */
-       NodeSocketDrawFunction drawinputfunc;
-       NodeSocketDrawFunction drawoutputfunc;
+       NodeSocketDrawFunction draw_input;
+       NodeSocketDrawFunction draw_output;
 
        /// Optional custom label function for the node header.
        const char *(*labelfunc)(struct bNode *);