Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 16 Jan 2018 13:52:43 +0000 (14:52 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 16 Jan 2018 13:52:43 +0000 (14:52 +0100)
commitd4ff1a1f2c57cbe05aedf5fd19219323b94466ab
tree617be85ac8d3a55513eb0c4233ce7f8db8cd58c0
parent379a752ee7653e696dc350ca2f0122fd806a761c
parent0bdb1eab82f6582a2df1f55f19a03653846104a0
Merge branch 'master' into blender2.8
source/blender/gpu/intern/gpu_buffers.c