Blender Git Loki

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

Merge branch 'master' into asset-engine

Merge branch 'master' into asset-uuid

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).

Merge branch 'master' into asset-engine

Merge branch 'master' into asset-engine

Merge branch 'master' into asset-engine

AssetUUID: add basic default init value for asset part of it to rna creator.

Reauest from Cosmos pipeline R&D team.

AssetUUID: add basic search for Asset UUIDs in current .blend file.

Needed for Cosmos pipeline R&D.

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...).

Merge branch 'master' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/editors/space_file/file_ops.c

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/space_file/file_ops.c

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/space_file/filesel.c

Merge branch 'master' into asset-engine

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

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

Merge branch 'master' into asset-engine

Merge branch 'master' into asset-engine

Merge branch 'master' into asset-engine

Partial merge only, UI in filebrowser has been heavily changed and need
more work...

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/space_file/file_draw.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_operator_props.c

Merge branch 'master' into asset-engine