Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 15 Jun 2018 15:25:41 +0000 (17:25 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 15 Jun 2018 15:25:41 +0000 (17:25 +0200)
commit5b6ae0523e18fbc94ba523e20f6c783cb8b3aa89
tree478091477aea6fc67186cfcf2ddcd17a214b1366
parentca2be6912d7dd8b6770a2c00e62d33c7653c21c2
parentda9b1b14ed0ffd29fcff8f4ca64fff5f034532fc
Merge branch 'master' into blender2.8
source/blender/editors/interface/interface_layout.c
source/blender/editors/mesh/editmesh_utils.c
source/blender/editors/physics/dynamicpaint_ops.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/physics/physics_pointcache.c
source/blender/editors/undo/ed_undo.c
source/blender/editors/util/ed_util.c