Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 28 Oct 2018 15:41:30 +0000 (16:41 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 28 Oct 2018 15:41:30 +0000 (16:41 +0100)
commit046735d75148f5e27a3f4917010dd80f1691705d
treedb5a18ba5aa7e2178f4f1e34e7959c025b5677dc
parent94ab6429bbdaf9f3541c715c5ae32647d454692a
parente3d2df038001af8c67707c20a27e21571b1fdff6
Merge branch 'master' into blender2.8
build_files/cmake/macros.cmake
intern/cycles/blender/addon/engine.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/render/buffers.cpp
intern/cycles/render/shader.cpp
source/blender/editors/space_file/fsmenu.c