Blender Git Loki
Git Commits -> Revision a0cc71c
June 12, 2017, 01:16 (GMT) |
Merge branch 'blender2.8' into topbar Conflicts: release/scripts/startup/bl_ui/space_info.py source/blender/CMakeLists.txt source/blender/blenkernel/BKE_library.h source/blender/blenkernel/BKE_screen.h source/blender/blenkernel/BKE_workspace.h source/blender/blenkernel/intern/blendfile.c source/blender/blenkernel/intern/idcode.c source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/library_query.c source/blender/blenkernel/intern/screen.c source/blender/blenkernel/intern/workspace.c source/blender/blenloader/BLO_readfile.h source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/versioning_280.c source/blender/blenloader/intern/versioning_defaults.c source/blender/blenloader/intern/writefile.c source/blender/editors/include/ED_scene.h source/blender/editors/include/ED_screen.h source/blender/editors/interface/interface_intern.h source/blender/editors/interface/interface_layout.c source/blender/editors/interface/interface_templates.c source/blender/editors/interface/interface_utils.c source/blender/editors/object/object_edit.c source/blender/editors/scene/CMakeLists.txt source/blender/editors/scene/scene_edit.c source/blender/editors/screen/area.c source/blender/editors/screen/screen_edit.c source/blender/editors/screen/screen_intern.h source/blender/editors/screen/screen_ops.c source/blender/editors/screen/workspace_edit.c source/blender/editors/screen/workspace_layout_edit.c source/blender/editors/space_file/filesel.c source/blender/editors/space_outliner/outliner_intern.h source/blender/editors/space_view3d/view3d_header.c source/blender/editors/transform/transform_manipulator.c source/blender/editors/transform/transform_ops.c source/blender/editors/transform/transform_orientations.c source/blender/imbuf/intern/thumbs_blend.c source/blender/makesdna/DNA_ID.h source/blender/makesdna/intern/makesdna.c source/blender/makesrna/intern/rna_internal.h source/blender/makesrna/intern/rna_main.c source/blender/makesrna/intern/rna_main_api.c source/blender/makesrna/intern/rna_scene.c source/blender/makesrna/intern/rna_screen.c source/blender/makesrna/intern/rna_space.c source/blender/makesrna/intern/rna_space_api.c source/blender/makesrna/intern/rna_wm.c source/blender/makesrna/intern/rna_workspace.c source/blender/python/intern/bpy_library_load.c source/blender/windowmanager/intern/wm_draw.c source/blender/windowmanager/intern/wm_event_system.c source/blender/windowmanager/intern/wm_files_link.c source/blender/windowmanager/intern/wm_window.c source/blenderplayer/bad_level_call_stubs/stubs.c |
Commit Details:
Full Hash: a0cc71ce7aa978b613e6bb776918adaee6704569
Parent Commits: c2f6ca3, f920910