Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 30 Jul 2018 06:26:29 +0000 (16:26 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 30 Jul 2018 06:26:29 +0000 (16:26 +1000)
commitdd38a712778e633c48fa71d2d72c8ae69b67af55
tree47753d29e43e80ebc78b28ea93d408ed922f14e7
parentf8f4feefb8083e7f5875ae81b678a4c7c3c81660
parentf4379f8b914eaf7aa1f17323f927836a3d9288fc
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_scene.h
source/blender/blenkernel/intern/scene.c
source/blender/editors/animation/anim_ops.c