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)
commit54af61440eb1eeb2ab30edb71c351fa9182395c4
tree57b9b04d8bf1156f94df555b8eba5f820b8df78a
parenta04c29e8abae93bb27d22ce1d7322b793fc19fa9
parent717d85fb1ca5491f4f3f62b81d65f7148ada8c64
Merge branch 'master' into blender2.8
source/blender/editors/render/render_internal.c