archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

moved node_shader_lamp_loop to node.c and put an extern declaration in BKE_node.h to prevent multiple definition link errors.

Browse Source
This commit is contained in:
Robert Holcomb
2007-03-28 13:07:59 +00:00
parent 51c748aeef
commit 39ef0f4eba
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_node.h
View File

@@ -207,7 +207,7 @@ void ntreeShaderGetTexcoMode(struct bNodeTree *ntree, int osa, short *texco, i
void nodeShaderSynchronizeID(struct bNode *node, int copyto);
/* switch material render loop */
void (*node_shader_lamp_loop)(struct ShadeInput *, struct ShadeResult *);
extern void (*node_shader_lamp_loop)(struct ShadeInput *, struct ShadeResult *);
void set_node_shader_lamp_loop(void (*lamp_loop_func)(struct ShadeInput *, struct ShadeResult *));

2
source/blender/blenkernel/intern/node.c
View File

@@ -2159,6 +2159,8 @@ void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int do_preview)
/* **************** call to switch lamploop for material node ************ */
void (*node_shader_lamp_loop)(struct ShadeInput *, struct ShadeResult *);
void set_node_shader_lamp_loop(void (*lamp_loop_func)(ShadeInput *, ShadeResult *))
{
node_shader_lamp_loop= lamp_loop_func;