Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 30 Nov 2017 14:11:06 +0000 (15:11 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 30 Nov 2017 14:11:06 +0000 (15:11 +0100)
commita989913dd4c777ac936671ab214144429087e4ad
tree2d6a43d604b11814b731a8e76a5e2de4a7b2a6fe
parent79bbbf7e200258b63c0e4e71e9a8508b11a95946
parentc241d79dc8a8ee144bc904f0a9b039b452df44bd
Merge branch 'master' into blender2.8
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap_object.c
source/blender/makesdna/DNA_object_types.h