Blender Git Loki

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

Page: 2 / 79

November 26, 2019, 14:50 (GMT)
Merge branch 'asset-uuid' into asset-engine
November 26, 2019, 14:49 (GMT)
Merge branch 'master' into asset-uuid
November 25, 2019, 17:11 (GMT)
Merge branch 'asset-uuid' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_asset_engine.h
source/blender/blenkernel/intern/asset_engine.c
source/blender/blenloader/BLO_readfile.h
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_asset.c
November 25, 2019, 16:55 (GMT)
Merge branch 'master' into asset-engine
November 25, 2019, 16:54 (GMT)
Merge branch 'master' into asset-uuid
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).
November 25, 2019, 15:07 (GMT)
Merge branch 'master' into asset-engine
November 18, 2019, 11:37 (GMT)
Merge branch 'master' into asset-engine
November 7, 2019, 15:25 (GMT)
Merge branch 'master' into asset-engine
November 6, 2019, 16:08 (GMT)
AssetUUID: add basic default init value for asset part of it to rna creator.

Reauest from Cosmos pipeline R&D team.
November 6, 2019, 15:52 (GMT)
AssetUUID: add basic search for Asset UUIDs in current .blend file.

Needed for Cosmos pipeline R&D.
November 5, 2019, 13:37 (GMT)
Initial basic support for assets definition in .blend file itself, and RNA api access.

This still *very* basic, but should be usable as proof of concept for
Cosmos pipeline tests...

Note that the question of where to put all asset metadata remains open,
we could extend AssetUUID struct, and/or add support of IDProps to it,
or just use some special-named IDProp in IDs themselves (like the
_RNA_UI thing for custo; props UI settings...).
November 5, 2019, 13:35 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/editors/space_file/file_ops.c
October 14, 2019, 19:14 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/space_file/file_ops.c
October 10, 2019, 09:02 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/space_file/filesel.c
September 30, 2019, 09:34 (GMT)
Merge branch 'master' into asset-engine
September 19, 2019, 18:51 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/writefile.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_files_link.c
September 12, 2019, 13:45 (GMT)
Merge branch 'master' into asset-engine

Note: reworking filebrowser UI is still TODO.

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/include/ED_fileselect.h
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_view3d/space_view3d.c
September 5, 2019, 07:46 (GMT)
Merge branch 'master' into asset-engine
September 5, 2019, 07:24 (GMT)
Merge branch 'master' into asset-engine
Tehnyt: Miika HämäläinenViimeksi p?ivitetty: 07.11.2014 14:18 MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021