Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 27 Nov 2017 13:32:19 +0000 (14:32 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 27 Nov 2017 13:32:19 +0000 (14:32 +0100)
commitf54e076ae648507200993f251d51710acf0b1d68
tree2eb6ad13670f139f189d6a6d9eecfffa585d4b3e
parent408515810e99d40a6dd53c3d50f1e4be7eb52c87
parentef439a1f7e348599557fc14dfe738d4b093e2b6f
Merge branch 'master' into blender2.8
source/blender/editors/render/render_opengl.c