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 |
Revision cfde6eb by Julian Eisel (asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived) 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 |
Revision 5e50380 by Julian Eisel (asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived) 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 |
Revision 15e6f90 by Julian Eisel (asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived) June 11, 2020, 09:55 (GMT) |
Merge branch 'master' into asset-uuid |
Revision 0b6def7 by Julian Eisel (asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived) June 11, 2020, 09:54 (GMT) |
Fixes for changes in master |
Revision a8b24ca by Julian Eisel (asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived) 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 |
Revision 15a9779 by Bastien Montagne (asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived) 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 |
Revision f3ae50c by Bastien Montagne (asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived) 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 |
Revision cdacfc2 by Bastien Montagne (asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived) 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 |
Revision 67ee496 by Bastien Montagne (asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived) 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). |
|
|
RSS Feeds |
Master Commits
MiikaHweb | 2003-2021