Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 19 Oct 2017 11:58:01 +0000 (13:58 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 19 Oct 2017 11:58:01 +0000 (13:58 +0200)
commit0f8a57de68f706f73c25c8c456113f25ed634662
tree834d9b1e1049d3118c57dfe3eb88fd369b814d0f
parent335e454db65571e16756d7b287e81bc4dea6b7e6
parent1cddab18ded9489f2f29b0655698f2e2e4e2076a
Merge branch 'master' into blender2.8
intern/cycles/device/device_cuda.cpp
source/blender/blenkernel/intern/lamp.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/world.c