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

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

@ -1,14 +1,15 @@
import bpy import bpy
from . import config
import os import os
from pathlib import Path from pathlib import Path
from . import constants
from . import config
from .prefs import get_addon_prefs
from .merge.naming import task_layer_prefix_transfer_data_update from .merge.naming import task_layer_prefix_transfer_data_update
from .merge.task_layer import ( from .merge.task_layer import (
draw_task_layer_selection, draw_task_layer_selection,
) )
from .merge.publish import get_next_published_file, find_all_published from .merge.publish import get_next_published_file, find_all_published
from .images import save_images from .images import save_images
from . import constants
from .sync import ( from .sync import (
sync_invoke, sync_invoke,
sync_draw, sync_draw,
@ -17,7 +18,6 @@ from .sync import (
sync_execute_pull, sync_execute_pull,
sync_execute_push, sync_execute_push,
) )
from . import constants
class ASSETPIPE_OT_create_new_asset(bpy.types.Operator): class ASSETPIPE_OT_create_new_asset(bpy.types.Operator):
@ -337,7 +337,9 @@ class ASSETPIPE_OT_sync_push(bpy.types.Operator):
return context.window_manager.invoke_props_dialog(self, width=400) return context.window_manager.invoke_props_dialog(self, width=400)
def draw(self, context: bpy.types.Context): def draw(self, context: bpy.types.Context):
self.layout.prop(self, "pull") prefs = get_addon_prefs()
if prefs.is_advanced_mode:
self.layout.prop(self, "pull")
self.layout.prop(self, "save") self.layout.prop(self, "save")
sync_draw(self, context) sync_draw(self, context)