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 05ccedbc0c - Show all commits

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

@ -6,7 +6,7 @@ from .merge.task_layer import draw_task_layer_selection
from .config import verify_json_data from .config import verify_json_data
class ASSETPIPE_sync(bpy.types.Panel): class ASSETPIPE_PT_sync(bpy.types.Panel):
bl_space_type = 'VIEW_3D' bl_space_type = 'VIEW_3D'
bl_region_type = 'UI' bl_region_type = 'UI'
bl_category = 'Asset Pipe 2' bl_category = 'Asset Pipe 2'
@ -56,7 +56,7 @@ class ASSETPIPE_sync(bpy.types.Panel):
# box.prop(asset_pipe, "is_depreciated") # box.prop(asset_pipe, "is_depreciated")
class ASSETPIPE_ownership_inspector(bpy.types.Panel): class ASSETPIPE_PT_ownership_inspector(bpy.types.Panel):
bl_space_type = 'VIEW_3D' bl_space_type = 'VIEW_3D'
bl_region_type = 'UI' bl_region_type = 'UI'
bl_category = 'Asset Pipe 2' bl_category = 'Asset Pipe 2'
@ -94,8 +94,8 @@ class ASSETPIPE_ownership_inspector(bpy.types.Panel):
classes = ( classes = (
ASSETPIPE_sync, ASSETPIPE_PT_sync,
ASSETPIPE_ownership_inspector, ASSETPIPE_PT_ownership_inspector,
) )