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

4
scripts-blender/addons/asset_pipeline_2/sync.py
View File

@ -41,7 +41,6 @@ def sync_invoke(self, context):
ownership_get(local_col, context.scene) ownership_get(local_col, context.scene)
# TODO Remove Invalid Objs Explicitly, some will be auto removed but not all
self._invalid_objs = get_invalid_objects(local_col, context.scene) self._invalid_objs = get_invalid_objects(local_col, context.scene)
self._shared_ids = init_shared_ids(context.scene) self._shared_ids = init_shared_ids(context.scene)
@ -104,6 +103,9 @@ def sync_execute_prepare_sync(self, context):
self.report({'ERROR'}, "Sync Target could not be determined") self.report({'ERROR'}, "Sync Target could not be determined")
return {'CANCELLED'} return {'CANCELLED'}
for obj in self._invalid_objs:
bpy.data.objects.remove(obj)
def sync_execute_pull(self, context): def sync_execute_pull(self, context):
temp_file = self._temp_dir.joinpath( temp_file = self._temp_dir.joinpath(