Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jun 2018 07:06:14 +0000 (09:06 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jun 2018 07:06:14 +0000 (09:06 +0200)
commit5b643018348280ee601a20fb9329d5a313c23446
treeb2bb37028ac88a655aea37bb7a8b850b84885cea
parentf6743fcaa4fbccd4bd8a92c44a3cd4bd2d153fd1
parent2d3d76693a84224b86eac50729fb5a321753b7e3
Merge branch 'master' into blender2.8
14 files changed:
release/scripts/startup/bl_ui/space_dopesheet.py
release/scripts/startup/bl_ui/space_time.py
source/blender/bmesh/intern/bmesh_mesh.c
source/blender/python/bmesh/CMakeLists.txt
source/blender/python/bmesh/bmesh_py_types.c
source/blender/python/generic/bgl.c
source/blender/python/generic/blf_py_api.c
source/blender/python/generic/bpy_internal_import.c
source/blender/python/generic/bpy_internal_import.h
source/blender/python/intern/bpy.c
source/blender/python/intern/bpy_app.c
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_rna_anim.c
source/blender/python/intern/bpy_rna_callback.c