Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 6 May 2018 14:00:27 +0000 (16:00 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 6 May 2018 14:00:27 +0000 (16:00 +0200)
commit541258bfa60e90ff6c0b89ed2972963a9f53db86
tree4b3bd64253a9ad25990ead29b3b361b817dee0e3
parentf28d209591d712b5c25051d3e5aea7b293b9f059
parent84474b0171eba502cbde345ce44707ba6dde7203
Merge branch 'master' into blender2.8
source/blender/editors/include/ED_transform_snap_object_context.h
source/blender/editors/transform/transform_snap.c
source/blender/editors/transform/transform_snap_object.c