Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Thu, 24 Aug 2017 08:41:59 +0000 (10:41 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 24 Aug 2017 08:41:59 +0000 (10:41 +0200)
1  2 
source/blender/editors/object/object_bake_api.c
source/blender/editors/space_view3d/view3d_edit.c