Blender Git Commits

USD: consistent comment style

USD: Removed superfluous comment

USD: also stop job when `*stop = true`

USD: expanded explanation of `HierarchyContext::weak_export`

USD: replace `#define` with anonymous enum

USD: fixed copyright year in license blocks

USD: enable USD in Release configuration

Cleanup: Fix copyright year

Merge branch 'master' into functions

Mantaflow: Cleaned up smoke noise code

Mantaflow: Added flame vorticity functionality

Mantaflow: Added cache reset functionality

Particularly important for cache replay mode

Mantaflow: Updated Manta pointer exchange setup

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 greasepencil-object

Merge branch 'master' into asset-engine

Merge branch 'master' into tmp-task-foreach-pool