diff options
author | Matt Ebb <matt@mke3.net> | 2009-11-10 07:01:44 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2009-11-10 07:01:44 +0300 |
commit | bc006655baf74ef0e22167a704899000b748c23f (patch) | |
tree | 8dc52b6f99446b2b49de57ca3a35e01f9cfcfbeb /source/blender/blenkernel | |
parent | ad409e5c7e3a235ed93f6927d960583521bc8f7d (diff) |
* Finished (well, almost ;) RNA wrapping and layout-engine-ing all the nodes.
Still a few quirks, including redraw issues on multilayer image input nodes, but it's pretty much there.
Would also be good to wrap the input/output sockets, too, will check on it.
This fixes bug [#19740] INPUT NODE: Cannot load images / motion pictures
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 66776d086d6..4c872fb247c 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -53,6 +53,7 @@ struct GPUMaterial; struct GPUNode; struct GPUNodeStack; struct PointerRNA; +struct bContext; /* ************** NODE TYPE DEFINITIONS ***** */ @@ -83,7 +84,7 @@ typedef struct bNodeType { void (*execfunc)(void *data, struct bNode *, struct bNodeStack **, struct bNodeStack **); /* this line is set on startup of blender */ - void (*uifunc)(struct uiLayout *, struct PointerRNA *ptr); + void (*uifunc)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr); void (*initfunc)(struct bNode *); void (*freestoragefunc)(struct bNode *); diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 6b2c812b37e..f6d6bb14b7e 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1054,7 +1054,7 @@ bNodeTree *ntreeAddTree(int type) if(ntree->type==NTREE_SHADER) BLI_strncpy(ntree->id.name, "NTShader Nodetree", sizeof(ntree->id.name)); else if(ntree->type==NTREE_COMPOSIT) - BLI_strncpy(ntree->id.name, "NTComposit Nodetree", sizeof(ntree->id.name)); + BLI_strncpy(ntree->id.name, "NTCompositing Nodetree", sizeof(ntree->id.name)); else if(ntree->type==NTREE_TEXTURE) BLI_strncpy(ntree->id.name, "NTTexture Nodetree", sizeof(ntree->id.name)); |