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)
commit711ac904816cb4d5e19ed9302b6c99b5aa4eaddd
treedd4a44dca4a9608bcf0841bb3dad8d21255d651d
parent4c746bb3b02552a4571cb7bb2369185f86a66935
parent9de9f25b2455808335b5373003695610599daab7
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/ui.py