Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Wed, 21 Jun 2017 13:14:42 +0000 (15:14 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Wed, 21 Jun 2017 13:14:42 +0000 (15:14 +0200)
commit4ceb006706579a0ad2301d2cde57489b69a7683c
tree3825806212dd3d3e5f8a44a16b9b82cfe8142c81
parent2ae172ec32da4a1aacd268bdba45bf82cff7eea9
parent22466a5bdff73afb6ad3afd408e265517e4f3733
Merge remote-tracking branch 'origin/master' into blender2.8
12 files changed:
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_layout.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_fluidsim.c
source/blender/modifiers/intern/MOD_meshdeform.c
source/blender/modifiers/intern/MOD_ocean.c
source/blender/modifiers/intern/MOD_surfacedeform.c
source/blender/modifiers/intern/MOD_uvproject.c
tests/python/CMakeLists.txt
tests/python/bl_alembic_import_test.py