Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Thu, 25 Jan 2018 13:31:54 +0000 (11:31 -0200)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 25 Jan 2018 13:31:54 +0000 (11:31 -0200)
commit748adb37e5a0c4de136fae64e9b1aa41defee3cf
tree7748703338475df01bd4bf08e59acbaaf4e1ea89
parente057d7b9eb3f7641008e2cd77be9691d84433e5d
parentda4c3f30d984b361d7c00b103ec329d5263779ff
Merge remote-tracking branch 'origin/master' into blender2.8
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/addon/version_update.py
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/render/render_shading.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c