Merge branch 'master' into blender2.8
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 8 Feb 2018 18:00:20 +0000 (03:00 +0900)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 8 Feb 2018 18:00:20 +0000 (03:00 +0900)
commit3b61d2bb68d96c15e9d00fecea17e0794f613a78
treee6c3af4361a8825b4219a1965c1dc2f327a1b4b9
parent74fa84f37f718939474334abe975797462ec8e29
parent859379ac487509f3eed96de5c78f934fbd3490d2
Merge branch 'master' into blender2.8

Conflicts:
intern/cycles/blender/addon/ui.py
intern/cycles/blender/addon/ui.py
tests/python/CMakeLists.txt