Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 12 Sep 2018 09:30:35 +0000 (11:30 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 12 Sep 2018 09:30:35 +0000 (11:30 +0200)
commit4464a86a6e0d368209995ea5ea52990e1656b356
tree1195466fd1bac89f17179ec83390c8f485bdc694
parent8f1027a58b501422e458b24a113d24183a8da2d3
parentf088bbae6af2224b49103d8cba5129f92796ffa6
Merge branch 'master' into blender2.8
source/blender/render/intern/source/external_engine.c