Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 9 Mar 2017 19:11:50 +0000 (06:11 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 9 Mar 2017 19:11:50 +0000 (06:11 +1100)
1  2 
intern/cycles/blender/addon/ui.py

Simple merge