Updated engon from monorepo commit f309e58c0a949b3c388cdcead68af72b3e1d661f

Author: Griperis

README.md

@@ -17,7 +17,7 @@
   <a href="https://github.com/polygoniq/engon/issues/new?assignees=&labels=question&template=04_SUPPORT_QUESTION.md&title=support%3A+">Ask a Question</a>
   <br />
 
-  [![Buy on BlenderMarket](https://img.shields.io/badge/Buy_on-BlenderMarket-orange?style=flat)](https://blendermarket.com/products/engon?ref=673)
+  [![Buy on Superhive](https://img.shields.io/badge/Buy_on-Superhive-orange?style=flat)](https://superhivemarket.com/products/engon?ref=673)
   [![Buy on Gumroad](https://img.shields.io/badge/Buy_on-Gumroad-blue?style=flat&color=%23fb80e8)](https://polygoniq.gumroad.com/l/engon/)
   [![Project license](https://img.shields.io/github/license/polygoniq/engon.svg?style=flat)](LICENSE)
   [![Pull Requests welcome](https://img.shields.io/badge/PRs-welcome-ff69b4.svg?style=flat)](https://github.com/polygoniq/engon/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)

__init__.py

@@ -106,6 +106,7 @@
     from . import asset_registry
     from . import asset_pack_installer
     from . import pack_info_search_paths
+    from . import available_asset_packs
     from . import asset_helpers
     from . import preferences
     from . import convert_selection
@@ -132,12 +133,12 @@
 bl_info = {
     "name": "engon",
     "author": "polygoniq xyz s.r.o.",
-    "version": (1, 5, 1),  # bump doc_url and version in register as well!
+    "version": (1, 6, 0),  # bump doc_url and version in register as well!
     "blender": (3, 6, 0),
     "location": "polygoniq tab in the sidebar of the 3D View window",
     "description": "Browse assets, filter and sort, scatter, animate, adjust rigs",
     "category": "Object",
-    "doc_url": "https://docs.polygoniq.com/engon/1.5.1/",
+    "doc_url": "https://docs.polygoniq.com/engon/1.6.0/",
     "tracker_url": "https://polygoniq.com/discord/",
 }
 
@@ -154,14 +155,17 @@ def _post_register():
         polib.ui_bpy.expand_addon_prefs(__package__)
         prefs.first_time_register = False
 
+    addon_updater_ops.check_for_update_background()
+
 
 def register():
     # We pass mock "bl_info" to the updater, as from Blender 4.2.0, the "bl_info" is
     # no longer available in this scope.
-    addon_updater_ops.register({"version": (1, 5, 1)})
+    addon_updater_ops.register({"version": (1, 6, 0)})
 
     utils.register()
     pack_info_search_paths.register()
+    available_asset_packs.register()
     convert_selection.register()
     panel.register()
     scatter.register()
@@ -195,6 +199,7 @@ def unregister():
     scatter.unregister()
     panel.unregister()
     convert_selection.unregister()
+    available_asset_packs.unregister()
     pack_info_search_paths.unregister()
     utils.unregister()
 

addon_updater_ops.py

@@ -1472,7 +1472,7 @@ def register(bl_info):
     # check for update in user preferences found a new version, show a popup
     # (at most once per blender session, and it provides an option to ignore
     # for future sessions); default behavior is set to True.
-    updater.show_popups = True
+    updater.show_popups = False
     # note: if set to false, there will still be an "update ready" box drawn
     # using the `update_notice_box_ui` panel function.
 

asset_helpers.py

@@ -34,6 +34,7 @@
 
 
 PARTICLE_SYSTEMS_COLLECTION = "engon_particle_systems"
+GEONODES_TARGET_COLLECTION = "engon_geometry_nodes"
 ANIMATION_EMPTIES_COLL_NAME = "animation_empties"
 
 
@@ -50,7 +51,7 @@
 BOTANIQ_ALL_SEASONS_RAW = "spring-summer-autumn-winter"
 BQ_COLLECTION_NAME = "botaniq"
 BQ_VINE_GENERATOR_NODE_GROUP_NAME = "bq_Vine_Generator"
-BQ_CURVES_GENERATOR_NODE_GROUP_NAME = "bq_Generator_Curves"
+BQ_CURVES_SCATTER_NODE_GROUP_NAME = "bq_Curve_Scatter"
 BQ_ANIM_LIBRARY_BLEND = "bq_Library_Animation_Data.blend"
 
 # traffiq constants
@@ -299,6 +300,38 @@ def gather_instanced_objects(
                 yield from instance_collection.all_objects
 
 
+def gather_curves_instanced_objects(
+    objects: typing.Iterable[bpy.types.Object],
+) -> typing.Iterator[bpy.types.Object]:
+    """Goes through 'objects' and gathers all objects instanced in curve scatter.
+
+    This checks whether any object from 'objects' is a polygoniq curve scatter and if yes
+    it yields objects from curve scatter instance collections.
+    """
+    for obj in objects:
+        for mod in obj.modifiers:
+            if mod.type != 'NODES':
+                continue
+
+            mod = typing.cast(bpy.types.NodesModifier, mod)
+
+            if mod.node_group is None or not mod.node_group.name.startswith(
+                BQ_CURVES_SCATTER_NODE_GROUP_NAME
+            ):
+                continue
+
+            for group_input in mod.node_group.inputs:
+                if group_input.type == 'COLLECTION' and group_input.description.startswith(
+                    "bq_Curve_Scatter_Collection"
+                ):
+                    if mod.get(group_input.identifier) is not None:
+                        yield from mod.get(group_input.identifier).all_objects
+
+            instance_collection = mod.node_group.nodes.get("Instance Collection")
+            if instance_collection is not None and instance_collection.collection is not None:
+                yield from instance_collection.collection.all_objects
+
+
 def get_car_color() -> typing.Tuple[float, float, float]:
     value = random.random()
     idx = bisect.bisect(TQ_COLOR_DISTRIBUTION, value, key=lambda x: x[0]) - 1

asset_pack_installer.py

@@ -784,6 +784,8 @@ def _get_install_path(self) -> str:
         description="Select Asset Pack Install Path",
         set=_set_install_path,
         get=_get_install_path,
+        # We use custom file browser in lower versions
+        subtype='DIR_PATH' if bpy.app.version >= (4, 1, 0) else 'NONE',
     )
 
     # Used for passing to operators when offering to switch operation

asset_registry.py

@@ -157,6 +157,8 @@ def __init__(
         # newest one.
         self.full_name = full_name
         # Short name of the asset pack, without variant
+        # TODO: This might not be unique for all asset packs, as evermotion packs don't have
+        # variants in their names and are treated differently.
         assert "_" in full_name
         self.short_name = full_name.rsplit("_")[0]
         # Semantic version of the asset pack
@@ -473,6 +475,9 @@ def _unregister_pack(self, asset_pack: AssetPack) -> None:
     def get_registered_packs(self) -> typing.Iterable[AssetPack]:
         return self._packs_by_full_name.values()
 
+    def get_registered_packs_full_names(self) -> typing.Set[str]:
+        return set(self._packs_by_full_name.keys())
+
     def get_install_paths_by_engon_feature(self) -> typing.Dict[str, typing.List[str]]:
         """Returns a dictionary with engon features as keys and list of related packs as values"""
         output_dict: typing.Dict[str, typing.List[str]] = {}