Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 21 Aug 2017 05:41:03 +0000 (15:41 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 21 Aug 2017 05:41:03 +0000 (15:41 +1000)
commit3e555d3d785b17bf9398d7666d5131c994da8c6b
treed15aaa353e31ed2acbd105d2b48ac4b1c99ea1e5
parentd007828ae78d66cdcc005d9ba3ad57e987f0190a
parent0033f0e161d984b38d3a36d18448f16baef121aa
Merge branch 'master' into blender2.8
12 files changed:
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/device/device_cuda.cpp
make.bat
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/editors/object/object_transform.c
source/blender/nodes/shader/nodes/node_shader_fresnel.c
source/blender/nodes/shader/nodes/node_shader_layer_weight.c