diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-10-16 21:36:44 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-10-16 21:36:45 +0300 |
| commit | e8962f90de4222d6f750d3d3478eff65490365d8 (patch) | |
| tree | 45d534da762cab5b697d371fef0b42dffaad1f47 /source/blender/gpu | |
| parent | a2758152e2dccb3b016e13a3de2d9e58587866ab (diff) | |
Fix compatibility flag for nodetree
NODE_NEWER_SHADING was introduced in e868b459bb8e however it should have been
added as a bitflag.
BKE_scene_uses_blender_eevee() was used in gpu_shader_output() as a workaround
for compatibility being poorly used.
Anyways this fixes this situation. This is necessary for an upcoming patch, even
though this is considered temporary - since the other NODE_*_SHADING values are
legacy from Blender Internal drawing.
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index a08bef4472a..ef37d6bd02a 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -2154,7 +2154,7 @@ GPUMaterial *GPU_material_from_nodetree( mat->engine_type = engine_type; mat->options = options; - ntreeGPUMaterialNodes(ntree, mat, NODE_NEWER_SHADING); + ntreeGPUMaterialNodes(ntree, mat, NODE_NEW_SHADING | NODE_NEWER_SHADING); /* Let Draw manager finish the construction. */ if (mat->outlink) { |