Merge branch 'blender-v2.82-release'
authorPhilipp Oeser <info@graphics-engineer.com>
Wed, 29 Jan 2020 19:25:35 +0000 (20:25 +0100)
committerPhilipp Oeser <info@graphics-engineer.com>
Wed, 29 Jan 2020 19:29:20 +0000 (20:29 +0100)
commit3984586292855bb6710facf5845b44f5d11dcc6f
treec649e5d521ad4f9012276fcf0175f4e75db22bb7
parent35c6d68d35699fe088537074ebaa5034c8e6321e
parente4faed120d9c294ea5d6061b3213ed4f6784db52
Merge branch 'blender-v2.82-release'

Merge conflict in source/blender/gpu/GPU_texture.h
source/blender/blenloader/intern/versioning_280.c
source/blender/draw/engines/workbench/workbench_forward.c