Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 4 Nov 2018 23:30:33 +0000 (00:30 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 4 Nov 2018 23:30:33 +0000 (00:30 +0100)
commit1e56c8c47deae730269d7d3e48243ae1c79e6153
treec7dcd372a1fdaac98f120316b9d01014166fa1b4
parent4e37796976f9cbea24f3e94e0145cf280a5918f9
parentb98f76cd90a14d500fb9a059b95aa32c3ab9e6e4
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/engine.py
intern/cycles/render/buffers.cpp
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp