Merge branch 'blender-v2.82-release'
authorLukas Stockner <lukas.stockner@freenet.de>
Thu, 16 Jan 2020 01:21:32 +0000 (02:21 +0100)
committerLukas Stockner <lukas.stockner@freenet.de>
Thu, 16 Jan 2020 01:21:32 +0000 (02:21 +0100)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/gpu/intern/gpu_texture.c