Blender Git Loki
July 1, 2020, 15:13 (GMT) |
Merge branch 'master' into asset-uuid--archived |
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 |
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 |
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 |
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. |
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. |
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. |
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). |
Revision 2563953 by Bastien Montagne (asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived) November 26, 2019, 14:49 (GMT) |
Merge branch 'master' into asset-uuid |
Revision bc13ceb by Bastien Montagne (asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived) November 25, 2019, 16:54 (GMT) |
Merge branch 'master' into asset-uuid |
Revision 0eda3ba by Bastien Montagne (asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived) November 25, 2019, 16:42 (GMT) |
Add 'asset uuid' to IDs. This commit is a subset of the asset-engine branch, only adding the uuid struct to data-blocks, with a basic minimal RNA/Python API to use it. it does not contain anything regarding asset engines and asset management itself. Besides being a first step towards full integration of asset engine work into master, it is also the 'minimal requirement' from the studio here for next Cosmos production pipeline (regarding own in-house management tools). |