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)
1  2 
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

Simple merge
Simple merge