[Bf-blender-cvs] [15305950a5d] asset-engine: Amber: fix some more stupid issues/mistakes.

[Bastien Montagne]

Commit: 15305950a5dac825892985cb9eec8299817da1ea
Author: Bastien Montagne
Date:   Mon Oct 30 16:23:48 2017 +0100
Branches: asset-engine
https://developer.blender.org/rB15305950a5dac825892985cb9eec8299817da1ea

Amber: fix some more stupid issues/mistakes.

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

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

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

diff --git a/release/scripts/startup/bl_operators/amber/engine.py b/release/scripts/startup/bl_operators/amber/engine.py
index b06d773a255..30f3de47c15 100644
--- a/release/scripts/startup/bl_operators/amber/engine.py
+++ b/release/scripts/startup/bl_operators/amber/engine.py
@@ -323,7 +323,7 @@ class AssetEngineAmber(AssetEngine):
         variants_gen(entry, e, vuuid, ruuid, wuuid)
 
         if act_view:
-            entry.relpath = os.path.relpath(act_view.path, self.repository.path)
+            entry.relpath = os.path.relpath(os.path.join(self.repository.path, act_view.path), self.repository.path)
 #        print("added entry for", entry.relpath)
 
     def pretty_version(self, v=None):
diff --git a/release/scripts/startup/bl_operators/amber/operators.py b/release/scripts/startup/bl_operators/amber/operators.py
index 389482ab0e6..96cd2f7b77e 100644
--- a/release/scripts/startup/bl_operators/amber/operators.py
+++ b/release/scripts/startup/bl_operators/amber/operators.py
@@ -183,6 +183,7 @@ class AmberOpsAssetAdd(Operator, AmberOpsEditing):
         off_idx = len(ret)
         ret += [(".".join(("textures", tex.name)), tex.name, "", 'TEXTURE_DATA', off_idx + idx)
                         for idx, tex in enumerate(tex for tex in bpy.data.textures if tex.library is None)]
+        return ret
     datablock_name = EnumProperty(items=datablock_name_enum_itemf,
                                   name="ID Name", description="Name of the local datablock to create asset from")
 
@@ -342,15 +343,11 @@ 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'}