Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 2 May 2018 12:40:00 +0000 (14:40 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 2 May 2018 12:40:00 +0000 (14:40 +0200)
commit5659d8bc0aa334aee20f29548e048f3002f1cff6
tree924286c8a2cac613491de5fabb6208192960f58a
parent23fe6e7eab3a728f1d1c6df2cef97ad02c222d37
parent522bee3fc838c83b377d0e05fef8299a29ae5a16
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/paint.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/object/object_transform.c
source/blender/editors/physics/particle_object.c
source/blender/editors/transform/transform_snap_object.c
source/blender/modifiers/intern/MOD_surface.c
source/blender/modifiers/intern/MOD_surfacedeform.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/render/intern/source/bake_api.c