Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 29 Oct 2018 12:26:09 +0000 (13:26 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 29 Oct 2018 12:26:09 +0000 (13:26 +0100)
commite7f423dffd22c0bf3c3da0cb3747e59ebee3ecb1
treee1620d574928704ffafd87bd8ea1b5b8728bcfb8
parent48f9e24f0c1e8ad97510a7a26a88c855be0ba6d7
parent17d91bcb611b7191cc2d0dfe4b77e07917634aa9
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/properties.py