Merge remote-tracking branch 'origin/master' into blender2.8
authorLukas Stockner <lukas.stockner@freenet.de>
Thu, 14 Jun 2018 20:54:42 +0000 (22:54 +0200)
committerLukas Stockner <lukas.stockner@freenet.de>
Thu, 14 Jun 2018 20:54:42 +0000 (22:54 +0200)
commit27de412ca8de4edad99a46ebdb8aadd7003e42a6
tree4e2659e3490519021195ba626de74adc4813e825
parent525be2f579c994777328bd7ac206be4769d3e6a4
parent3ee606621cf53a2a4897e534e7e04d3632f419f8
Merge remote-tracking branch 'origin/master' into blender2.8
14 files changed:
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/addon/version_update.py
intern/cycles/blender/blender_curves.cpp
intern/cycles/blender/blender_mesh.cpp
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_session.cpp
intern/cycles/kernel/kernel_light.h
intern/cycles/render/image.cpp
intern/cycles/render/image.h
intern/cycles/render/light.cpp
intern/cycles/render/nodes.cpp
intern/cycles/render/shader.cpp
intern/cycles/render/shader.h