Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Fri, 19 Jan 2018 14:46:23 +0000 (12:46 -0200)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 19 Jan 2018 14:46:23 +0000 (12:46 -0200)
commitd9858d5897efbf0e41ebe61c2aaabf451c33d6ad
tree96661f5f7e5309ea6d5e9a803af77112ed039d89
parent7866870a9a58ce086f4af5dc7dc7bc8acf1e333c
parentedf053ff635e782d09b64d205fadfca3cce79de4
Merge remote-tracking branch 'origin/master' into blender2.8
intern/cycles/blender/blender_python.cpp
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/render/buffers.cpp
release/scripts/startup/bl_ui/space_outliner.py