studio/blender-studio-tools
13
30
Fork 19
Code Issues 20 Pull Requests 3 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 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bc2a5470ac - Show all commits

8
scripts-blender/addons/asset_pipeline_2/ops.py
View File

@ -538,8 +538,8 @@ class ASSETPIPE_OT_fix_prefixes(bpy.types.Operator):
class ASSETPIPE_OT_update_surrendered_object(bpy.types.Operator): class ASSETPIPE_OT_update_surrendered_object(bpy.types.Operator):
bl_idname = "assetpipe.update_surrendered_object" bl_idname = "assetpipe.update_surrendered_object"
bl_label = "Update Surrendered" bl_label = "Claim Surrendered"
bl_description = """Update Surrended Object Owner""" bl_description = """Claim Surrended Object Owner"""
_obj = None _obj = None
_old_onwer = "" _old_onwer = ""
@ -573,8 +573,8 @@ class ASSETPIPE_OT_update_surrendered_object(bpy.types.Operator):
class ASSETPIPE_OT_update_surrendered_transfer_data(bpy.types.Operator): class ASSETPIPE_OT_update_surrendered_transfer_data(bpy.types.Operator):
bl_idname = "assetpipe.update_surrendered_transfer_data" bl_idname = "assetpipe.update_surrendered_transfer_data"
bl_label = "Update Surrendered" bl_label = "Claim Surrendered"
bl_description = """Update Surrended Transfer Data Owner""" bl_description = """Claim Surrended Transfer Data Owner"""
transfer_data_item_name: bpy.props.StringProperty(name="Transfer Data Item Name") transfer_data_item_name: bpy.props.StringProperty(name="Transfer Data Item Name")