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

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

@ -59,6 +59,7 @@ class ASSETPIPE_OT_create_new_asset(bpy.types.Operator):
asset_col = bpy.data.collections.get(self._name) asset_col = bpy.data.collections.get(self._name)
context.scene.collection.children.link(asset_col) context.scene.collection.children.link(asset_col)
asset_status.asset_collection = asset_col asset_status.asset_collection = asset_col
asset_pipe = context.scene.asset_pipeline
for task_layer_name in constants.TASK_LAYER_NAMES: for task_layer_name in constants.TASK_LAYER_NAMES:
if task_layer_name == "None": if task_layer_name == "None":
@ -71,9 +72,11 @@ class ASSETPIPE_OT_create_new_asset(bpy.types.Operator):
continue continue
name = self._name + "." + task_layer_key + ".blend" name = self._name + "." + task_layer_key + ".blend"
task_layer_file = os.path.join(asset_path, name) task_layer_file = os.path.join(asset_path, name)
asset_pipe.task_layer_name = task_layer_key
bpy.ops.wm.save_as_mainfile(filepath=task_layer_file, copy=True) bpy.ops.wm.save_as_mainfile(filepath=task_layer_file, copy=True)
# Creata intial publish based on task layers # Creata intial publish based on task layers
asset_pipe.task_layer_name = "NONE"
publish_path = os.path.join(asset_path, constants.ACTIVE_PUBLISH_KEY) publish_path = os.path.join(asset_path, constants.ACTIVE_PUBLISH_KEY)
name = self._name + "." + "v001" + ".blend" name = self._name + "." + "v001" + ".blend"
publish_file = os.path.join(publish_path, name) publish_file = os.path.join(publish_path, name)

3
scripts-blender/addons/asset_pipeline_2/props.py
View File

@ -51,6 +51,9 @@ class AssetPipeline(bpy.types.PropertyGroup):
temp_transfer_data: bpy.props.CollectionProperty(type=AssetTransferDataTemp) temp_transfer_data: bpy.props.CollectionProperty(type=AssetTransferDataTemp)
task_layer_name: bpy.props.EnumProperty(
name="Task Layer Name", items=constants.TASK_LAYER_TYPES
)
## NEW FILE ## NEW FILE
dir: bpy.props.StringProperty( dir: bpy.props.StringProperty(