[Bf-blender-cvs] [b4d8e949d8c] asset-engine: Amber: Fix bad tag handling in case of empty set.

Bastien Montagne noreply at git.blender.org
Mon Oct 30 14:29:00 CET 2017


Commit: b4d8e949d8c0fe2ecb2c779d36639123600e0a7b
Author: Bastien Montagne
Date:   Mon Oct 30 14:23:11 2017 +0100
Branches: asset-engine
https://developer.blender.org/rBb4d8e949d8c0fe2ecb2c779d36639123600e0a7b

Amber: Fix bad tag handling in case of empty set.

===================================================================

M	release/scripts/startup/bl_operators/amber/operators.py
M	release/scripts/startup/bl_operators/amber/repository.py

===================================================================

diff --git a/release/scripts/startup/bl_operators/amber/operators.py b/release/scripts/startup/bl_operators/amber/operators.py
index 8f2499972da..2495321b75c 100644
--- a/release/scripts/startup/bl_operators/amber/operators.py
+++ b/release/scripts/startup/bl_operators/amber/operators.py
@@ -337,11 +337,15 @@ class AmberOpsAssetTagRemove(Operator, AmberOpsEditing):
         ae = context.space_data.asset_engine
         asset = ae.repository_pg.assets[ae.repository_pg.asset_index_active]
         asset.tags.remove(asset.tag_index_active)
+        print(asset.tag_index_active, asset.tags[:])
 
         AmberDataRepository.update_from_asset_engine(ae)
 
         bpy.ops.file.refresh()
 
+        asset = ae.repository_pg.assets[ae.repository_pg.asset_index_active]
+        print(asset.tag_index_active, asset.tags[:])
+
         return {'FINISHED'}
 
 
diff --git a/release/scripts/startup/bl_operators/amber/repository.py b/release/scripts/startup/bl_operators/amber/repository.py
index ca219ade099..83e73850e03 100644
--- a/release/scripts/startup/bl_operators/amber/repository.py
+++ b/release/scripts/startup/bl_operators/amber/repository.py
@@ -124,8 +124,8 @@ class AmberDataTagPG(PropertyGroup):
                 tag_pg.name_prev = tag_pg.name = tag_name
                 tag_pg.priority = tag_priority
         else:
-            removed_tags = set(t.name for t in pg) - set(subset or tags)
-            added_tags = set(subset or tags) - set(t.name for t in pg)
+            removed_tags = set(t.name for t in pg) - set(subset if subset is not None else tags)
+            added_tags = set(subset if subset is not None else tags) - set(t.name for t in pg)
             for tag_name in removed_tags:
                 pg.remove(pg.find(tag_name))
             for tag_pg in pg:



More information about the Bf-blender-cvs mailing list