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)
commit11f9a23a286c17fc2b71804efdeacb797fb413a8
tree285b08d38f3115287737c4a99b7aef79ee22b450
parent4bd72586aa2ef6b0f595790ef4d066e9c18d487b
parent42ca1fe89cc93929426ab681a5520e5938158a4d
Merge branch 'master' into blender2.8
source/blender/gpu/shaders/gpu_shader_material.glsl