studio/blender-studio-tools
13
32
Fork 19
Code Issues 22 Pull Requests 4 Projects Releases 1 Activity

Asset Pipeline v2 #145

Closed
Nick Alberelli wants to merge 431 commits from (deleted):feature/asset-pipeline-v2 into main
pull from: (deleted):feature/asset-pipeline-v2
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 26 Commits 431 Files Changed 70 +3 -6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 27af5a9814 - Show all commits

9
scripts-blender/addons/asset_pipeline_2/props.py
View File

@ -10,7 +10,7 @@ avaliable task layers from the task_layer_defaults.json file that needs to be cr
class AssetTransferData(bpy.types.PropertyGroup):
"""Properties to track transferable data on an object"""
owner: bpy.props.StringProperty()
owner: bpy.props.StringProperty(name="Owner", default="NONE")
type: bpy.props.EnumProperty(
name="Transfer Data Type",
items=constants.TRANSFER_DATA_TYPES_ENUM_ITEMS,
@ -21,7 +21,7 @@ class AssetTransferDataTemp(bpy.types.PropertyGroup):
"""Class used when finding new ownership data so it can be drawn
with the same method as the existing ownership data from ASSET_TRANSFER_DATA"""
owner: bpy.props.StringProperty()
owner: bpy.props.StringProperty(name="Owner", default="NONE")
type: bpy.props.EnumProperty(
name="Transfer Data Type",
items=constants.TRANSFER_DATA_TYPES_ENUM_ITEMS,
@ -92,10 +92,7 @@ def register():
type=AssetTransferData
)
bpy.types.Scene.asset_pipeline = bpy.props.PointerProperty(type=AssetPipeline)
bpy.types.ID.asset_id_owner = bpy.props.EnumProperty(
name="ID Owner",
items=constants.TASK_LAYER_TYPES_ENUM_ITEMS,
)
bpy.types.ID.asset_id_owner = bpy.props.StringProperty(name="Owner", default="NONE")
def unregister():