blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

GPUMaterial: Force old outputs to fail with EEVEE. 

Workaround waiting for compatibility bit / or PyNodes.
This commit is contained in:
Clément Foucault 2017-05-02 19:56:44 +02:00
parent 5570ba9c4f
commit e0fded5d3a
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/nodes/shader/nodes/node_shader_output.c
View File

@ -32,6 +32,8 @@
#include "node_shader_util.h"
#include "BKE_scene.h"
/* **************** OUTPUT ******************** */
static bNodeSocketTemplate sh_node_output_in[] = {
{ SOCK_RGBA, 1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f},
@ -74,6 +76,10 @@ static int gpu_shader_output(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecDat
GPU_material_enable_alpha(mat);
#endif
if (BKE_scene_uses_blender_eevee(GPU_material_scene(mat))) {
return false;
}
GPU_stack_link(mat, "output_node", in, out, &outlink);
GPU_material_output_link(mat, outlink);

6
source/blender/nodes/shader/nodes/node_shader_output_material.c
View File

@ -27,6 +27,8 @@
#include "../node_shader_util.h"
#include "BKE_scene.h"
/* **************** OUTPUT ******************** */
static bNodeSocketTemplate sh_node_output_material_in[] = {
@ -40,6 +42,10 @@ static int node_shader_gpu_output_material(GPUMaterial *mat, bNode *UNUSED(node)
{
GPUNodeLink *outlink;
if (BKE_scene_uses_blender_eevee(GPU_material_scene(mat))) {
return false;
}
GPU_stack_link(mat, "node_output_material", in, out, &outlink);
GPU_material_output_link(mat, outlink);