Merge branch 'master' into blender2.8
authorAaron Carlisle <carlisle.b3d@gmail.com>
Fri, 21 Jul 2017 22:28:32 +0000 (18:28 -0400)
committerAaron Carlisle <carlisle.b3d@gmail.com>
Fri, 21 Jul 2017 22:28:32 +0000 (18:28 -0400)
commit3aeabe3afaa37f37afa6e740e1b299fe25ad5d2b
treee0895f58f717a0b25ead93c009478c1f00d08635
parent64fd45b1dfe5eceb8c1d2a6f04377ee202da2a3b
parenta27b6ae4a98c6f72d669b71c402291d6690c9e82
Merge branch 'master' into blender2.8
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/transform/transform_snap_object.c