Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 2 Apr 2018 13:18:10 +0000 (15:18 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 2 Apr 2018 13:18:10 +0000 (15:18 +0200)
commit89fdd8890633700f559039998f8d95c7a5f97df4
treea77306882df479d5d2d89f0f9d3529394b4fbe01
parent57bbd478a58a944a8f3146af25cfe34ee055fc86
parent4ffa05c30b10eb8a07dd0a9b43466f6d11bc1364
Merge branch 'master' into blender2.8
28 files changed:
build_files/cmake/macros.cmake
doc/doxygen/doxygen.source.h
source/blender/editors/CMakeLists.txt
source/blender/editors/curve/editcurve_add.c
source/blender/editors/curve/editcurve_undo.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_bisect.c
source/blender/editors/mesh/editmesh_extrude.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_internal.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_node/node_templates.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/undo/memfile_undo.c
source/blender/editors/util/CMakeLists.txt
source/blender/modifiers/intern/MOD_meshsequencecache.c
source/blender/python/intern/CMakeLists.txt
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_rna.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c