Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 21 Feb 2018 09:30:50 +0000 (10:30 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 21 Feb 2018 09:30:50 +0000 (10:30 +0100)
1  2 
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenkernel/intern/particle_child.c
source/blender/blenkernel/intern/sequencer.c

Simple merge