From 39ef0f4eba5c0890e6792c95ed8ae6c8804de28c Mon Sep 17 00:00:00 2001 From: Robert Holcomb Date: Wed, 28 Mar 2007 13:07:59 +0000 Subject: [PATCH] moved node_shader_lamp_loop to node.c and put an extern declaration in BKE_node.h to prevent multiple definition link errors. --- source/blender/blenkernel/BKE_node.h | 2 +- source/blender/blenkernel/intern/node.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 3da04b21170..78675325175 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -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 *)); diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 4ec678e363e..78005346335 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -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;