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)
Merge conflict in source/blender/gpu/GPU_texture.h

1  2 
source/blender/blenloader/intern/versioning_280.c
source/blender/draw/engines/workbench/workbench_forward.c