studio/blender-studio-tools
13
32
Fork 19
Code Issues 22 Pull Requests 4 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 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fccb06aaca - Show all commits

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

@ -1,6 +1,6 @@
import bpy import bpy
from . import asset_suffix, datablocks, transferable_data from . import asset_suffix, transferable_data
from pathlib import Path from pathlib import Path
from .asset_mapping import AssetTransferMapping from .asset_mapping import AssetTransferMapping

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

@ -9,7 +9,7 @@ def get_parent_col_name():
return "CH-chr_test" # TODO Replace Hard Coded Value return "CH-chr_test" # TODO Replace Hard Coded Value
def get_task_layer_name_from_file(self): def get_task_layer_name_from_file():
file_name = bpy.path.basename(bpy.context.blend_data.filepath) file_name = bpy.path.basename(bpy.context.blend_data.filepath)
task_layer_name = file_name.split(".")[-2] task_layer_name = file_name.split(".")[-2]
if task_layer_name in constants.TASK_LAYER_KEYS: if task_layer_name in constants.TASK_LAYER_KEYS:
@ -22,7 +22,7 @@ class ASSETPIPE_OT_update_ownership(bpy.types.Operator):
def execute(self, context): def execute(self, context):
obj = context.active_object obj = context.active_object
task_layer_name = get_task_layer_name_from_file(self) task_layer_name = get_task_layer_name_from_file()
if not task_layer_name: if not task_layer_name:
self.report({'ERROR'}, "Current File Name doesn't contain valid task layer") self.report({'ERROR'}, "Current File Name doesn't contain valid task layer")
return {'CANCELLED'} return {'CANCELLED'}
@ -39,7 +39,7 @@ class ASSETPIPE_OT_push_test(bpy.types.Operator):
def execute(self, context): def execute(self, context):
# Find current task Layer # Find current task Layer
current_file = Path(bpy.data.filepath) current_file = Path(bpy.data.filepath)
task_layer_name = get_task_layer_name_from_file(self) task_layer_name = get_task_layer_name_from_file()
if not task_layer_name: if not task_layer_name:
self.report({'ERROR'}, "Current File Name doesn't contain valid task layer") self.report({'ERROR'}, "Current File Name doesn't contain valid task layer")
return {'CANCELLED'} return {'CANCELLED'}
@ -72,7 +72,7 @@ class ASSETPIPE_OT_pull_test(bpy.types.Operator):
bl_label = 'Pull from Publish' bl_label = 'Pull from Publish'
def execute(self, context): def execute(self, context):
task_layer_name = get_task_layer_name_from_file(self) task_layer_name = get_task_layer_name_from_file()
if not task_layer_name: if not task_layer_name:
self.report({'ERROR'}, "Current File Name doesn't contain valid task layer") self.report({'ERROR'}, "Current File Name doesn't contain valid task layer")
return {'CANCELLED'} return {'CANCELLED'}