Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 11 May 2018 18:13:07 +0000 (20:13 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 11 May 2018 18:13:07 +0000 (20:13 +0200)
commit194cba8ba4aa829c135f891f18679d9a0889a8b9
tree58f49679bb04b517833136210f6f43dee36a1123
parentef49a587d44a8ab96693d05ab59506f5bfcbd84c
parent925e7758186048857f9483b037b27b0eaf701cce
Merge branch 'master' into blender2.8
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/mesh/mesh_ops.c
source/blender/windowmanager/intern/wm_event_system.c