Blender Git Commit Log

Git Commits -> Revision 93712fe

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

Commit Details:

Full Hash: 93712fed2cc72fcae1fb0409be02aa7837f25764
Parent Commits: 5f61756, e305560

By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021