Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 30 Oct 2018 13:13:47 +0000 (14:13 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 30 Oct 2018 13:13:47 +0000 (14:13 +0100)
commitdffde4a49cd73d0d6003258d6ac36526652cd5d5
treeca75c960a89099a359849bfa3f594e6e553fb649
parent500fbfd02a1cae02ecf34d6fe49748b3c1b8ac05
parent7c0d37deca32512ff38120bf1736160110fe97cb
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/engine.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_sync.cpp