Merge branch 'master' into blender2.8
authorGermano <germano.costa@ig.com.br>
Thu, 1 Feb 2018 00:34:29 +0000 (22:34 -0200)
committerGermano <germano.costa@ig.com.br>
Thu, 1 Feb 2018 00:34:29 +0000 (22:34 -0200)
1  2 
source/blender/gpu/shaders/gpu_shader_material.glsl