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 +5
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 544f04bd23 - Show all commits

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

@ -182,6 +182,7 @@ class ASSETPIPE_OT_sync_with_publish(bpy.types.Operator):
temp_transfer_data = context.scene.asset_pipeline.temp_transfer_data temp_transfer_data = context.scene.asset_pipeline.temp_transfer_data
core.ownership_set(temp_transfer_data) core.ownership_set(temp_transfer_data)
current_file = Path(bpy.data.filepath) current_file = Path(bpy.data.filepath)
temp_dir = Path(bpy.app.tempdir).parent
task_layer_name = context.scene.asset_pipeline.task_layer_name task_layer_name = context.scene.asset_pipeline.task_layer_name
if task_layer_name == "NONE": if task_layer_name == "NONE":
self.report({'ERROR'}, "Current File Name doesn't contain valid task layer") self.report({'ERROR'}, "Current File Name doesn't contain valid task layer")
@ -193,6 +194,10 @@ class ASSETPIPE_OT_sync_with_publish(bpy.types.Operator):
return {'CANCELLED'} return {'CANCELLED'}
if self.pull: if self.pull:
temp_file = temp_dir.joinpath(
current_file.name.replace(".blend", "") + "_Asset_Pipe_Backup.blend"
)
bpy.ops.wm.save_as_mainfile(filepath=temp_file.__str__(), copy=True)
error_msg = core.merge_task_layer( error_msg = core.merge_task_layer(
context, context,
local_tls=[task_layer_name], local_tls=[task_layer_name],