Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Mon, 13 Nov 2017 13:48:48 +0000 (11:48 -0200)
committerDalai Felinto <dfelinto@gmail.com>
Mon, 13 Nov 2017 13:48:48 +0000 (11:48 -0200)
commit1cb6cea71c10c0d22ba9cdd3eee5111d0734c193
tree1cbd74c668006be134692e883ceef7286db3a368
parentf30a2a786214c4ef08612486c227add0bb6bf35b
parent8a03e4d409ec71beab612facf432eb57f3bc5f34
Merge remote-tracking branch 'origin/master' into blender2.8
intern/cycles/device/device_cuda.cpp
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/bmesh/bmesh_py_types_meshdata.c