diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 02:37:04 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 02:37:04 +0400 |
commit | ae25aa22105b060294095357692f2aed4c650ce8 (patch) | |
tree | 06548276f86326f21943f8ec7ef92765a97b5ab5 /source/blender/makesrna/RNA_enum_types.h | |
parent | 29b7b344fc48ed31b1e36818ab4767090691d6e2 (diff) | |
parent | 03762409cd4f812d152e42de9c4f9853df91be0b (diff) |
svn merge ^/trunk/blender -r55372:55392
Diffstat (limited to 'source/blender/makesrna/RNA_enum_types.h')
-rw-r--r-- | source/blender/makesrna/RNA_enum_types.h | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index 8038f97ec54..09d08db59d7 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -29,6 +29,10 @@ #include "RNA_types.h" +struct bNodeTreeType; +struct bNodeType; +struct bNodeSocketType; + /* Types */ extern EnumPropertyItem id_type_items[]; @@ -128,8 +132,23 @@ extern EnumPropertyItem gameproperty_type_items[]; extern EnumPropertyItem viewport_shade_items[]; -extern EnumPropertyItem nodetree_type_items[]; -extern EnumPropertyItem node_socket_type_items[]; +int rna_node_tree_type_to_enum(struct bNodeTreeType *typeinfo); +int rna_node_tree_idname_to_enum(const char *idname); +struct bNodeTreeType *rna_node_tree_type_from_enum(int value); +EnumPropertyItem *rna_node_tree_type_itemf(void *data, int (*poll)(void *data, struct bNodeTreeType *), int *free); + +int rna_node_type_to_enum(struct bNodeType *typeinfo); +int rna_node_idname_to_enum(const char *idname); +struct bNodeType *rna_node_type_from_enum(int value); +EnumPropertyItem *rna_node_type_itemf(void *data, int (*poll)(void *data, struct bNodeType *), int *free); + +int rna_node_socket_type_to_enum(struct bNodeSocketType *typeinfo); +int rna_node_socket_idname_to_enum(const char *idname); +struct bNodeSocketType *rna_node_socket_type_from_enum(int value); +EnumPropertyItem *rna_node_socket_type_itemf(void *data, int (*poll)(void *data, struct bNodeSocketType *), int *free); + +extern EnumPropertyItem node_socket_in_out_items[]; +extern EnumPropertyItem node_icon_items[]; extern EnumPropertyItem node_math_items[]; extern EnumPropertyItem node_vec_math_items[]; |