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

Fix T38633: glsl not working well with mixed cycles/blender material nodes.

Browse Source
This commit is contained in:
Brecht Van Lommel
2014-02-14 15:11:19 +01:00
parent 8439a165ff
commit a252e27fec
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -770,7 +770,7 @@ void ntreeShaderGetTexcoMode(struct bNodeTree *ntree, int osa, short
extern void (*node_shader_lamp_loop)(struct ShadeInput *, struct ShadeResult *);
void set_node_shader_lamp_loop(void (*lamp_loop_func)(struct ShadeInput *, struct ShadeResult *));
void ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat);
void ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat, short compatibility);
/* ************** COMPOSITE NODES *************** */

5
source/blender/gpu/intern/gpu_material.c
View File

@@ -1592,7 +1592,10 @@ GPUMaterial *GPU_material_from_blender(Scene *scene, Material *ma)
if (!(scene->gm.flag & GAME_GLSL_NO_NODES) && ma->nodetree && ma->use_nodes) {
/* create nodes */
ntreeGPUMaterialNodes(ma->nodetree, mat);
if (BKE_scene_use_new_shading_nodes(scene))
ntreeGPUMaterialNodes(ma->nodetree, mat, NODE_NEW_SHADING);
else
ntreeGPUMaterialNodes(ma->nodetree, mat, NODE_OLD_SHADING);
}
else {
if (BKE_scene_use_new_shading_nodes(scene)) {

4
source/blender/nodes/shader/node_shader_tree.c
View File

@@ -187,14 +187,14 @@ void register_node_tree_type_sh(void)
/* GPU material from shader nodes */
void ntreeGPUMaterialNodes(bNodeTree *ntree, GPUMaterial *mat)
void ntreeGPUMaterialNodes(bNodeTree *ntree, GPUMaterial *mat, short compatibility)
{
/* localize tree to create links for reroute and mute */
bNodeTree *localtree = ntreeLocalize(ntree);
bNodeTreeExec *exec;
exec = ntreeShaderBeginExecTree(localtree);
ntreeExecGPUNodes(exec, mat, 1);
ntreeExecGPUNodes(exec, mat, 1, compatibility);
ntreeShaderEndExecTree(exec);
ntreeFreeTree_ex(localtree, false);

3
source/blender/nodes/shader/node_shader_util.c
View File

@@ -219,7 +219,7 @@ bNode *nodeGetActiveTexture(bNodeTree *ntree)
return inactivenode;
}
void ntreeExecGPUNodes(bNodeTreeExec *exec, GPUMaterial *mat, int do_outputs)
void ntreeExecGPUNodes(bNodeTreeExec *exec, GPUMaterial *mat, int do_outputs, short compatibility)
{
bNodeExec *nodeexec;
bNode *node;
@@ -238,6 +238,7 @@ void ntreeExecGPUNodes(bNodeTreeExec *exec, GPUMaterial *mat, int do_outputs)
do_it = FALSE;
/* for groups, only execute outputs for edited group */
if (node->typeinfo->nclass == NODE_CLASS_OUTPUT) {
if (node->typeinfo->compatibility & compatibility)
if (do_outputs && (node->flag & NODE_DO_OUTPUT))
do_it = TRUE;
}

2
source/blender/nodes/shader/node_shader_util.h
View File

@@ -98,6 +98,6 @@ void node_gpu_stack_from_data(struct GPUNodeStack *gs, int type, struct bNodeSta
void node_data_from_gpu_stack(struct bNodeStack *ns, struct GPUNodeStack *gs);
void node_shader_gpu_tex_mapping(struct GPUMaterial *mat, struct bNode *node, struct GPUNodeStack *in, struct GPUNodeStack *out);
void ntreeExecGPUNodes(struct bNodeTreeExec *exec, struct GPUMaterial *mat, int do_outputs);
void ntreeExecGPUNodes(struct bNodeTreeExec *exec, struct GPUMaterial *mat, int do_outputs, short compatibility);
#endif

2
source/blender/nodes/shader/nodes/node_shader_common.c
View File

@@ -218,7 +218,7 @@ static int gpu_group_execute(GPUMaterial *mat, bNode *node, bNodeExecData *execd
#if 0 /* XXX NODE_GROUP_EDIT is deprecated, depends on node space */
ntreeExecGPUNodes(exec, mat, (node->flag & NODE_GROUP_EDIT));
#else
ntreeExecGPUNodes(exec, mat, 0);
ntreeExecGPUNodes(exec, mat, 0, NODE_NEW_SHADING|NODE_OLD_SHADING);
#endif
group_gpu_move_outputs(node, out, exec->stack);