Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Nov 2017 15:17:01 +0000 (16:17 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Nov 2017 15:17:01 +0000 (16:17 +0100)
commit0c4f69a2bfdc02dbebd2aaf6f6112cf899781321
treea4016d3054f33aaaf982d52730e3a26b9836cad3
parentf24103d50afe177c40dffa49092962e6ba8ed648
parentf1c78ecc6337873061afb6ebbb1c9ba2b6642d84
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_scene_api.c