Blender Git Commits

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

July 1, 2020, 15:25 (GMT)
Merge branch 'asset-uuid--archived' into asset-engine--archived
July 1, 2020, 15:13 (GMT)
Merge branch 'master' into asset-uuid--archived
June 16, 2020, 09:31 (GMT)
Merge branch 'asset-uuid' into asset-engine
June 16, 2020, 09:31 (GMT)
Merge branch 'master' into asset-uuid
June 13, 2020, 20:54 (GMT)
Merge branch 'asset-uuid' into asset-engine
June 13, 2020, 20:54 (GMT)
Merge branch 'master' into asset-uuid
June 11, 2020, 13:50 (GMT)
Fixes for changes in master after last merge
June 11, 2020, 13:49 (GMT)
Merge branch 'asset-uuid' into asset-engine
June 11, 2020, 09:55 (GMT)
Merge branch 'master' into asset-uuid
June 11, 2020, 09:54 (GMT)
Fixes for changes in master
June 11, 2020, 08:13 (GMT)
Merge branch 'master' into asset-uuid
November 26, 2019, 17:18 (GMT)
Merge branch 'asset-uuid' into asset-engine
November 26, 2019, 17:15 (GMT)
Remove the Amber asset engine code, this has nothing to do in that patch.
November 26, 2019, 17:13 (GMT)
Fix after recent merge...
November 26, 2019, 17:06 (GMT)
Merge branch 'asset-uuid' into asset-engine

Conflicts:
source/blender/makesrna/intern/rna_asset.c
November 26, 2019, 16:59 (GMT)
Rename some variables in AssetUUID struct.
November 26, 2019, 16:46 (GMT)
Merge branch 'asset-uuid' into asset-engine
November 26, 2019, 16:45 (GMT)
Some more minor fixes/cleanups.
November 26, 2019, 16:37 (GMT)
Merge branch 'asset-uuid' into asset-engine

Conflicts:
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/writefile.c
November 26, 2019, 16:34 (GMT)
Updates from code review.

Mostly various cleanups, and a few important fixes too (some potential
memleaks, missing writing of UUID struct for ID placeholders of linked
data-block in writefile.c).
By: Miika HämäläinenLast update: Nov-07-2014 14:18 MiikaHweb | 2003-2020