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

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

@ -385,7 +385,7 @@ class ASSETPIPE_OT_update_local_task_layers(bpy.types.Operator):
layout.label( layout.label(
text="Caution, this only affects current file.", text="Caution, this only affects current file.",
icon="ERROR", icon="ERROR",
) # TODO Improve warning )
layout.label( layout.label(
text="Two files owning the same task layer can break merge process." text="Two files owning the same task layer can break merge process."
) )