[Bf-blender-cvs] [1617f3e] master: Docs: callback comments
Campbell Barton
noreply at git.blender.org
Tue Oct 27 17:20:32 CET 2015
Commit: 1617f3e425f0c1ca115ed3be9e9ee85b9a0ab264
Author: Campbell Barton
Date: Wed Oct 28 03:13:49 2015 +1100
Branches: master
https://developer.blender.org/rB1617f3e425f0c1ca115ed3be9e9ee85b9a0ab264
Docs: callback comments
===================================================================
M source/blender/blenkernel/BKE_node.h
M source/blender/makesdna/DNA_node_types.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 88e54d0..4522530 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -172,7 +172,10 @@ typedef struct bNodeType {
/* Additional drawing on backdrop */
void (*draw_backdrop)(struct SpaceNode *snode, struct ImBuf *backdrop, struct bNode *node, int x, int y);
- /// Optional custom label function for the node header.
+ /**
+ * Optional custom label function for the node header.
+ * \note Used as a fallback when #bNode.label isn't set.
+ */
void (*labelfunc)(struct bNodeTree *ntree, struct bNode *node, char *label, int maxlen);
/// Optional custom resize handle polling.
int (*resize_area_func)(struct bNode *node, int x, int y);
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index fd3391f..6d282f4 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -384,6 +384,7 @@ typedef struct bNodeTree {
/* callbacks */
void (*progress)(void *, float progress);
+ /** \warning may be called by different threads */
void (*stats_draw)(void *, const char *str);
int (*test_break)(void *);
void (*update_draw)(void *);
More information about the Bf-blender-cvs
mailing list