Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Nov 2017 15:31:53 +0000 (16:31 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Nov 2017 15:31:53 +0000 (16:31 +0100)
commitc4501ccb17c4151dbf7fe33760caf7fca996e605
treeaf4ad824253bc35f6a604087737491152a6627ab
parent0c4f69a2bfdc02dbebd2aaf6f6112cf899781321
parent6664ee209e96fe4a4ae8018bcf10f798a3b53751
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_scene_api.c