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)
commit552656611bb441fe623ffb9b3ae8cc4d01d42409
tree1c1112c7173707d9bde1068a390c62cab5d997f7
parente20c825b05e00954995fe2ed74e7fb409d09abe8
parent1fb263700672f7a26d4e99a75aedbf258be5d173
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/editors/object/object_bake_api.c
source/blender/editors/space_view3d/view3d_edit.c