Merge branch 'master' into 28
authorCampbell Barton <ideasman42@gmail.com>
Wed, 12 Apr 2017 10:23:30 +0000 (20:23 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 12 Apr 2017 10:23:44 +0000 (20:23 +1000)
commitaf2fc7b6373ae582168a254c36bc808d8478dd03
tree243ffcc61cbf40139c8cd7eb0033fdaf607cc34a
parent0c9a2def8b1e40a0b5a3ed348d1fd92cc13096ff
parent4560f0b007db592e386c1829caf0c1a52a48c584
Merge branch 'master' into 28
source/blender/gpu/intern/gpu_basic_shader.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_framebuffer.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/intern/gpu_texture.c
source/blender/gpu/intern/gpu_viewport.c