Blender Git Commits

Blender Git "asset-engine" branch commits.

Page: 3 / 79

August 30, 2019, 07:55 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenloader/intern/versioning_280.c
source/blender/makesdna/DNA_ID.h
August 23, 2019, 08:42 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/versioning_280.c
August 19, 2019, 17:14 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library.c
August 6, 2019, 10:42 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/versioning_defaults.c
source/blender/windowmanager/intern/wm_files.c
July 28, 2019, 12:58 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/versioning_280.c
July 14, 2019, 18:58 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/editors/space_file/file_ops.c
source/blender/makesrna/intern/rna_space.c
source/blender/windowmanager/WM_api.h
May 23, 2019, 19:34 (GMT)
AssetEngines: fix memleaks in append case...
May 23, 2019, 19:12 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/space_file/space_file.c
source/blender/makesdna/DNA_space_types.h
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/intern/wm_init_exit.c
April 17, 2019, 10:30 (GMT)
Merge 'master' into 'asset-engine'
April 17, 2019, 10:30 (GMT)
Merge 'master' into 'asset-engine'
April 17, 2019, 10:30 (GMT)
Merge 'master' into 'asset-engine'
April 17, 2019, 10:30 (GMT)
Merge 'master' into 'asset-engine'
April 17, 2019, 10:30 (GMT)
Merge 'master' into 'asset-engine'
April 16, 2019, 12:47 (GMT)
Merge branch 'master' into asset-engine
April 16, 2019, 10:10 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/windowmanager/intern/wm_operator_props.c
March 18, 2019, 19:28 (GMT)
Merge branch 'master' into asset-engine

Kinda painful merge thanks to extensive changes to things like Main
listbases names, linking code, etc.

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_space_types.h
source/blender/windowmanager/intern/wm_files_link.c
February 19, 2019, 09:33 (GMT)
Merge branch 'master' into asset-engine
February 9, 2019, 19:08 (GMT)
Merge branch 'master' into asset-engine
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
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021