Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 May 2017 15:44:17 +0000 (17:44 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 May 2017 15:44:17 +0000 (17:44 +0200)
1  2 
source/blender/editors/render/render_internal.c