Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Sun, 8 Apr 2018 15:54:07 +0000 (17:54 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Sun, 8 Apr 2018 15:54:07 +0000 (17:54 +0200)
commite9f048052f89d3995ff8555290fa0f4c0ce9126b
tree8b95b03e0bea26f7e4f983b5021129ca12ef9560
parentafbc73ab72c3c9d84389e2689021766ad3e73bc6
parentd6a1a0ebb86c3e0ca14540f79fbf54e7429d28a1
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_scene.c