Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 8 Feb 2018 12:48:36 +0000 (23:48 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 8 Feb 2018 12:48:36 +0000 (23:48 +1100)
commitc3e61cab8a95fe4fe6878ea6adb0f97f5118d6fb
tree5e486e059dece19dd9613688c22e5d08ad4022f6
parent022a481789efc40297acc5b7a3c9efbe4a75bc27
parentf088c6b9f6d69e7f1af15a059f122589ee6a39ab
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/editors/animation/anim_channels_edit.c