[Bf-blender-cvs] [a57e03a17a4] asset-engine: Update Amber & generic Asset Engine code for changes in 2.8.
Bastien Montagne
noreply at git.blender.org
Wed Jan 9 17:14:42 CET 2019
Commit: a57e03a17a4f0cfa05d0b1bfd6a4b9fb61597265
Author: Bastien Montagne
Date: Wed Jan 9 17:13:36 2019 +0100
Branches: asset-engine
https://developer.blender.org/rBa57e03a17a4f0cfa05d0b1bfd6a4b9fb61597265
Update Amber & generic Asset Engine code for changes in 2.8.
Many noisy changes in past 6 months... ;)
===================================================================
M release/scripts/modules/amber/engine.py
M release/scripts/modules/amber/operators.py
M release/scripts/modules/amber/repository.py
M release/scripts/modules/amber/ui.py
M source/blender/makesrna/intern/rna_asset.c
===================================================================
diff --git a/release/scripts/modules/amber/engine.py b/release/scripts/modules/amber/engine.py
index 58464a0063c..8615eabf707 100644
--- a/release/scripts/modules/amber/engine.py
+++ b/release/scripts/modules/amber/engine.py
@@ -215,8 +215,8 @@ class AssetEngineAmber(AssetEngine):
bl_label = "Amber"
bl_version = (0 << 16) + (0 << 8) + 4 # Usual maj.min.rev version scheme...
- repository_pg = PointerProperty(name="Repository", type=AmberDataRepositoryPG, description="Current Amber repository")
- repositories_pg = PointerProperty(name="Repositories", type=AmberDataRepositoryListPG, description="Known Amber repositories")
+ repository_pg: PointerProperty(name="Repository", type=AmberDataRepositoryPG, description="Current Amber repository")
+ repositories_pg: PointerProperty(name="Repositories", type=AmberDataRepositoryListPG, description="Known Amber repositories")
def __init__(self):
self.executor = futures.ThreadPoolExecutor(8) # Using threads for now, if issues arise we'll switch to process.
diff --git a/release/scripts/modules/amber/operators.py b/release/scripts/modules/amber/operators.py
index ed57fd5413a..a09f2e53dd6 100644
--- a/release/scripts/modules/amber/operators.py
+++ b/release/scripts/modules/amber/operators.py
@@ -105,7 +105,7 @@ class AmberOpsRepositoryRemove(Operator, AmberOpsEditing):
bl_label = "Remove Repository"
bl_options = set()
- do_erase = BoolProperty(name="Erase", description="Actually erase active repository")
+ do_erase: BoolProperty(name="Erase", description="Actually erase active repository")
def execute(self, context):
ae = context.space_data.asset_engine
@@ -164,16 +164,16 @@ class AmberOpsAssetAdd(Operator, AmberOpsEditing):
bl_label = "Add Asset"
bl_options = set()
- active_type = EnumProperty(items=(('NONE', "None", "Do not use context to find an active data-block to create asset from"),
- ('OBJECT', "Object/Group", "Active Object or Group in Blender"),
- ('MATERIAL', "Material", "Active material from active Object"),
- # TODO More options?
- ),
- name="Asset Type", description="Type of active datablock to create the asset from")
+ active_type: EnumProperty(items=(('NONE', "None", "Do not use context to find an active data-block to create asset from"),
+ ('OBJECT', "Object/Group", "Active Object or Group in Blender"),
+ ('MATERIAL', "Material", "Active material from active Object"),
+ # TODO More options?
+ ),
+ name="Asset Type", description="Type of active datablock to create the asset from")
- copy_local = BoolProperty(name="Copy Local",
- description="Copy selected datablock and its dependencies into a library .blend file "
- "local to the repository (mandatory when current .blend file is not saved)")
+ copy_local: BoolProperty(name="Copy Local",
+ description="Copy selected datablock and its dependencies into a library .blend file "
+ "local to the repository (mandatory when current .blend file is not saved)")
def datablock_name_enum_itemf(self, context):
ret = [(".".join(("objects", ob.name)), ob.name, "", 'OBJECT_DATA', idx)
@@ -185,8 +185,8 @@ class AmberOpsAssetAdd(Operator, AmberOpsEditing):
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")
+ datablock_name: EnumProperty(items=datablock_name_enum_itemf,
+ name="ID Name", description="Name of the local datablock to create asset from")
@staticmethod # self is not op instance here, but menu generated by window manager...
def datablocks_select_menu(self, context):
@@ -314,7 +314,7 @@ class AmberOpsAssetTagAdd(Operator, AmberOpsEditing):
asset = ae.repository_pg.assets[ae.repository_pg.asset_index_active]
asset_tags = {t.name for t in asset.tags}
return [(t.name, t.name, t.name) for t in tags if t.name not in asset_tags]
- tag = EnumProperty(items=tags_enum_func, name="Tag", description="New tag to add to active asset")
+ tag: EnumProperty(items=tags_enum_func, name="Tag", description="New tag to add to active asset")
def execute(self, context):
ae = context.space_data.asset_engine
@@ -358,8 +358,8 @@ class AmberOpsTagAdd(Operator, AmberOpsEditing):
bl_label = "Add Tag"
bl_options = set()
- name = StringProperty(name="Name", description="New tag's name/identifier")
- priority = IntProperty(default=100,
+ name: StringProperty(name="Name", description="New tag's name/identifier")
+ priority: IntProperty(default=100,
name="Priority", description="New tag's priority, how close it will be from start of lists")
def execute(self, context):
diff --git a/release/scripts/modules/amber/repository.py b/release/scripts/modules/amber/repository.py
index ab8d1a3ad3a..6e45f39173e 100644
--- a/release/scripts/modules/amber/repository.py
+++ b/release/scripts/modules/amber/repository.py
@@ -72,11 +72,11 @@ class AmberDataTagPG(PropertyGroup):
AmberDataRepository.update_from_asset_engine(ae)
- name = StringProperty(name="Name", description="Tag name", update=tag_data_update)
- priority = IntProperty(name="Priority", default=0, update=tag_data_update,
- description="Tag priority (used to order tags, highest priority go first)")
+ name: StringProperty(name="Name", description="Tag name", update=tag_data_update)
+ priority: IntProperty(name="Priority", default=0, update=tag_data_update,
+ description="Tag priority (used to order tags, highest priority go first)")
- name_prev = StringProperty(options={'HIDDEN'})
+ name_prev: StringProperty(options={'HIDDEN'})
def include_update(self, context):
if self.use_include:
@@ -84,8 +84,8 @@ class AmberDataTagPG(PropertyGroup):
sd = context.space_data
if sd and sd.type == 'FILE_BROWSER' and sd.asset_engine:
sd.asset_engine.is_dirty_filtering = True
- use_include = BoolProperty(name="Include", default=False, description="This tag must exist in filtered items",
- update=include_update)
+ use_include: BoolProperty(name="Include", default=False, description="This tag must exist in filtered items",
+ update=include_update)
def exclude_update(self, context):
if self.use_exclude:
@@ -93,8 +93,8 @@ class AmberDataTagPG(PropertyGroup):
sd = context.space_data
if sd and sd.type == 'FILE_BROWSER' and sd.asset_engine:
sd.asset_engine.is_dirty_filtering = True
- use_exclude = BoolProperty(name="Exclude", default=False, description="This tag must not exist in filtered items",
- update=exclude_update)
+ use_exclude: BoolProperty(name="Exclude", default=False, description="This tag must not exist in filtered items",
+ update=exclude_update)
@staticmethod
def from_dict(tags, tags_dict):
@@ -134,14 +134,14 @@ class AmberDataTagPG(PropertyGroup):
class AmberDataAssetViewPG(PropertyGroup):
- uuid = IntVectorProperty(name="UUID", description="View unique identifier", size=4)
- name = StringProperty(name="Name", description="Asset/Variant/Revision view name")
- description = StringProperty(name="Description", description="Asset/Variant/Revision view description")
+ uuid: IntVectorProperty(name="UUID", description="View unique identifier", size=4)
+ name: StringProperty(name="Name", description="Asset/Variant/Revision view name")
+ description: StringProperty(name="Description", description="Asset/Variant/Revision view description")
- size = IntProperty(name="Size")
- timestamp = IntProperty(name="Timestamp")
+ size: IntProperty(name="Size")
+ timestamp: IntProperty(name="Timestamp")
- path = StringProperty(name="Path", description="File path of this item", subtype='FILE_PATH')
+ path: StringProperty(name="Path", description="File path of this item", subtype='FILE_PATH')
class AmberDataAssetView():
@@ -219,16 +219,16 @@ class AmberDataAssetView():
class AmberDataAssetRevisionPG(PropertyGroup):
- comment = StringProperty(name="Comment", description="Asset/Variant revision comment")
- uuid = IntVectorProperty(name="UUID", description="Revision unique identifier", size=4)
+ comment: StringProperty(name="Comment", description="Asset/Variant revision comment")
+ uuid: IntVectorProperty(name="UUID", description="Revision unique identifier", size=4)
- timestamp = IntProperty(name="Timestamp")
+ timestamp: IntProperty(name="Timestamp")
- views = CollectionProperty(name="Views", type=AmberDataAssetViewPG, description="Views of the revision")
- view_index_active = IntProperty(name="Active View", options={'HIDDEN'})
+ views: CollectionProperty(name="Views", type=AmberDataAssetViewPG, description="Views of the revision")
+ view_index_active: IntProperty(name="Active View", options={'HIDDEN'})
- view_default = IntVectorProperty(name="Default view", size=4,
- description="Default view of the revision, to be used when nothing explicitly chosen")
+ view_default: IntVectorProperty(name="Default view", size=4,
+ description="Default view of the revision, to be used when nothing explicitly chosen")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list