Blender Git Loki

Blender Git "asset-engine--archived" branch commits.

Page: 4 / 79

February 4, 2019, 10:30 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_global.h
source/blender/python/intern/bpy_app.c
January 30, 2019, 22:04 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenloader/BLO_readfile.h
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/makesdna/DNA_space_types.h
source/blender/windowmanager/intern/wm_files_link.c
January 14, 2019, 13:35 (GMT)
Merge branch 'master' into asset-engine
January 9, 2019, 16:13 (GMT)
Update Amber & generic Asset Engine code for changes in 2.8.

Many noisy changes in past 6 months... ;)
January 9, 2019, 16:09 (GMT)
Merge branch 'master' into asset-engine
January 9, 2019, 12:46 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_space_types.h
January 6, 2019, 16:27 (GMT)
Merge branch 'master' into asset-engine

Rather painful, too much cleanup/renamings in between...

Note that this is not currently functionnal, builds but does not show
AEs in filebrowser selector for some reason. No time to track that now.

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_script/script_edit.c
source/blender/editors/space_script/script_intern.h
source/blender/editors/space_script/script_ops.c
source/blender/makesrna/intern/rna_internal.h
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_files_link.c
September 10, 2018, 17:12 (GMT)
Merge branch 'blender2.8' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_280.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/include/UI_interface.h
source/blender/editors/space_view3d/space_view3d.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_dragdrop.c
source/blender/windowmanager/intern/wm_files_link.c
July 1, 2018, 14:53 (GMT)
Merge branch 'blender2.8' into asset-engine
July 1, 2018, 14:49 (GMT)
Merge branch 'blender2.8' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenloader/intern/versioning_280.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/windowmanager/WM_api.h
June 18, 2018, 11:03 (GMT)
Fix broken Amber after Group -> Collection change.
June 18, 2018, 10:59 (GMT)
Merge branch 'blender2.8' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_intern.h
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_space.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/intern/wm_init_exit.c
May 29, 2018, 09:15 (GMT)
Merge branch 'blender2.8' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_info.py
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_280.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_space.c
source/blender/windowmanager/intern/wm_files_link.c
source/blenderplayer/bad_level_call_stubs/stubs.c
April 13, 2018, 10:25 (GMT)
Merge branch 'blender2.8' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
April 13, 2018, 09:58 (GMT)
Typo
April 11, 2018, 13:24 (GMT)
Merge branch 'blender2.8' into asset-engine
April 11, 2018, 13:16 (GMT)
Fix again 'auto override' system.

Got lost in big undo refactor.

Note that this is probably (maybe) not how we want to have it in the
end, things like EditMode undo should probably not trigger this check?
April 11, 2018, 13:09 (GMT)
Merge branch 'blender2.8' into asset-engine
April 10, 2018, 16:24 (GMT)
Merge branch 'blender2.8' into asset-engine

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_ID.c
April 3, 2018, 15:53 (GMT)
Merge branch 'blender2.8' into asset-engine

Conflicts:
source/blender/windowmanager/intern/wm_init_exit.c
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021