Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Tue, 9 May 2017 15:56:16 +0000 (17:56 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Tue, 9 May 2017 15:56:16 +0000 (17:56 +0200)
1  2 
intern/cycles/blender/addon/properties.py