diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-02 19:53:01 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-02 19:53:01 +0300 |
commit | c50ccc847613bbe02bea64cee3f744b449da170c (patch) | |
tree | b4c4bf7ff6de61687691997eb077c28eef0420c7 /source/blender/gpu | |
parent | ba30b852f317494ad1c2f308295ee28a665e283a (diff) | |
parent | 3f9b69287d287af09c801a5203be07287128b2a0 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/shaders/gpu_shader_material.glsl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 440cfc0c814..3e8f0baf7b0 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -779,7 +779,7 @@ static void shade_light_textures(GPUMaterial *mat, GPULamp *lamp, GPUNodeLink ** for (int i = 0; i < MAX_MTEX; ++i) { MTex *mtex = lamp->la->mtex[i]; - if (mtex && mtex->tex->type & TEX_IMAGE && mtex->tex->ima) { + if (mtex && mtex->tex && (mtex->tex->type & TEX_IMAGE) && mtex->tex->ima) { mat->dynproperty |= DYN_LAMP_PERSMAT; float one = 1.0f; diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index 119bfb61fec..67da8201f66 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -2705,7 +2705,7 @@ void node_geometry( parametric = vec3(0.0); backfacing = (gl_FrontFacing) ? 0.0 : 1.0; - pointiness = 0.0; + pointiness = 0.5; } void node_tex_coord( |