Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Mon, 6 Mar 2017 12:00:46 +0000 (13:00 +0100)
committerJulian Eisel <eiseljulian@gmail.com>
Mon, 6 Mar 2017 12:00:46 +0000 (13:00 +0100)
commita5cba9aab9a2ade00caefc1a7697f8fbd3f7304f
treeb34138ac968663a47cdd2b09a26ea68aeeba2377
parentdc9a7f861fa43fecae7450ee254a711b061c0c26
parentb498db06eb43f1e036f16cb346bf4cbb6d20e6d5
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_view3d/view3d_draw.c
19 files changed:
CMakeLists.txt
source/blender/blenloader/intern/versioning_270.c
source/blender/bmesh/tools/bmesh_intersect.c
source/blender/editors/armature/armature_select.c
source/blender/editors/armature/editarmature_sketch.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/interface/interface_handlers.c
source/blender/editors/render/render_opengl.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_draw_legacy.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/modifiers/intern/MOD_boolean.c
source/blender/modifiers/intern/MOD_surfacedeform.c
source/blender/python/intern/gpu_offscreen.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_stereo.c
source/blender/windowmanager/wm.h