Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Wed, 10 May 2017 15:03:27 +0000 (17:03 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Wed, 10 May 2017 15:03:27 +0000 (17:03 +0200)
commite5ec386803f50c8fb75bd5ba842baa0c964ac3e1
tree87eb7ba9c80d0a8355802e5fc05b4f0347c73ca5
parent45207bf3ce96f008496caf1be8166fd09065c4a0
parent62aa925c11d00df0366ef17bf2baa165f73ab19c
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c