Merge branch 'master' into blender2.8

2016-10-02 18:53:01 +02:00
parent ba30b852f3 3f9b69287d
commit c50ccc8476
42 changed files with 451 additions and 194 deletions
--- 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(