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)
commit75ba1826c8c26c9b6afc13ceb45bfcfe3db2a188
treef414ed0fd7ffb4c0c6f9b2bc89fd3f5a69960ff9
parent24a64cb41479bf1ac191d830bf5b22a0c97402cc
parent4d38932cb430139975fd1fc13436317b2a16fdc4
Merge remote-tracking branch 'origin/master' into blender2.8
intern/cycles/blender/addon/properties.py