Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Nov 2017 14:47:00 +0000 (15:47 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Nov 2017 14:47:00 +0000 (15:47 +0100)
commitaad711d06428545c415b277fb6cf899a1cf1c03a
tree376d84216ed2d41328ff3b66e4b97efbba49e683
parenta02cbb3c3aab93e0c532fbcf8be04a77d5d6a27b
parent60703e45f36a92f8e49a7be7c951538e5b747a41
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/object_update.c
source/blender/editors/transform/transform_snap.c