[Bf-blender-cvs] [0e256653b22] asset-engine: Amber: Add icon of data type to 'all data' assets add operator.

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


Commit: 0e256653b223c77cf9276350a106f3d02ee3f05a
Author: Bastien Montagne
Date:   Mon Oct 30 14:28:29 2017 +0100
Branches: asset-engine
https://developer.blender.org/rB0e256653b223c77cf9276350a106f3d02ee3f05a

Amber: Add icon of data type to 'all data' assets add operator.

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

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

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

diff --git a/release/scripts/startup/bl_operators/amber/operators.py b/release/scripts/startup/bl_operators/amber/operators.py
index 2495321b75c..389482ab0e6 100644
--- a/release/scripts/startup/bl_operators/amber/operators.py
+++ b/release/scripts/startup/bl_operators/amber/operators.py
@@ -175,9 +175,14 @@ class AmberOpsAssetAdd(Operator, AmberOpsEditing):
                                           "local to the repository (mandatory when current .blend file is not saved)")
 
     def datablock_name_enum_itemf(self, context):
-        return ([(".".join(("objects", ob.name)), ob.name, "") for ob in bpy.data.objects if ob.library is None] +
-                [(".".join(("materials", mat.name)), mat.name, "") for mat in bpy.data.materials if mat.library is None] + 
-                [(".".join(("textures", tex.name)), tex.name, "") for tex in bpy.data.textures if tex.library is None])
+        ret = [(".".join(("objects", ob.name)), ob.name, "", 'OBJECT_DATA', idx)
+                        for idx, ob in enumerate(ob for ob in bpy.data.objects if ob.library is None)]
+        off_idx = len(ret)
+        ret += [(".".join(("materials", mat.name)), mat.name, "", 'MATERIAL_DATA', off_idx + idx)
+                        for idx, mat in enumerate(mat for mat in bpy.data.materials if mat.library is None)]
+        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)]
     datablock_name = EnumProperty(items=datablock_name_enum_itemf,
                                   name="ID Name", description="Name of the local datablock to create asset from")



More information about the Bf-blender-cvs mailing list