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)
1  2 
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/editors/animation/anim_channels_edit.c