Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Feb 2018 13:54:51 +0000 (14:54 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Feb 2018 13:54:51 +0000 (14:54 +0100)
commit4e8bd537c3b7101d1166c70a820a319de215eb17
tree2db94ae982f950ab6b71f19d421b584b72eedfa1
parentbd25e73c540d7fb7f2a3e52994429ed77bebcbd0
parent8b8e16dc2cedd03d0a22f89c9165c76722cc706a
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_scene.h
source/blender/blenkernel/intern/scene.c