Assets: Implement Traits #105841

Open

Harley Acheson wants to merge 2 commits from Harley/blender:AssetTraits into main

pull from: Harley/blender:AssetTraits

merge into: blender:main

blender:main

blender:brush-assets-project

blender:blender-v4.1-release

blender:blender-v3.3-release

blender:blender-v3.6-release

blender:universal-scene-description

blender:blender-v3.6-temp_wmoss_animrig_public

blender:temp-sculpt-dyntopo

blender:gpencil-next

blender:anim/animation-id-113594

blender:blender-v4.0-release

blender:blender-projects-basics

blender:bridge-curves

blender:sculpt-blender

blender:asset-browser-frontend-split

blender:asset-shelf

blender:tmp-usd-python-mtl

blender:tmp-usd-3.6

blender:blender-v3.5-release

blender:blender-v2.93-release

blender:realtime-clock

blender:sculpt-dev

blender:bevelv2

blender:xr-dev

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.

Conversation 17 Commits 2 Files Changed 6 +149 -3

2 Commits

Author	SHA1	Message	Date
Harley Acheson	cdc2eea37e	Updating with changes suggested by review	2023-07-13 09:54:26 -07:00
Harley Acheson	83d76c28f0	Removing the object type name stuff. Updating to fix merge conflicts.	2023-07-07 15:12:12 -07:00