Updated engon from monorepo commit fb392ce2ec7c6f941ea99a32e3466bae3f8d8161

Author: Griperis

__init__.py

@@ -132,12 +132,12 @@
 bl_info = {
     "name": "engon",
     "author": "polygoniq xyz s.r.o.",
-    "version": (1, 5, 0),  # bump doc_url and version in register as well!
+    "version": (1, 5, 1),  # 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.0/",
+    "doc_url": "https://docs.polygoniq.com/engon/1.5.1/",
     "tracker_url": "https://polygoniq.com/discord/",
 }
 
@@ -158,7 +158,7 @@ def _post_register():
 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, 0)})
+    addon_updater_ops.register({"version": (1, 5, 1)})
 
     utils.register()
     pack_info_search_paths.register()

asset_helpers.py

@@ -20,10 +20,12 @@
 
 import typing
 import bpy
+import bisect
 import enum
 import os
 import glob
 import collections
+import random
 import logging
 from . import polib
 from . import asset_registry
@@ -55,6 +57,30 @@
 TQ_MODIFIER_LIBRARY_BLEND = "tq_Library_Modifiers.blend"
 TQ_EMERGENCY_LIGHTS_NODE_GROUP_NAME = "tq_Emergency_Lights"
 TQ_LICENSE_PLATE_NODE_GROUP_NAME_PREFIX = "tq_License-Plate_"
+# Mimics the distribution of car colors in the real world
+TQ_COLOR_DISTRIBUTION = (
+    (0.0, (0.004, 0.004, 0.004)),  # 0E0E0E
+    (0.018, (0.063, 0.063, 0.063)),  # 474747
+    (0.031, (0.558, 0.558, 0.558)),  # C5C5C5
+    (0.041, (0.216, 0.004, 0.175)),  # 800E74
+    (0.043, (0.012, 0.001, 0.028)),  # 1D042F
+    (0.045, (0.295, 0.185, 0.0)),  # 947700
+    (0.053, (0.271, 0.22, 0.126441)),  # 8E8164
+    (0.060, (0.04, 0.099, 0.006)),  # 385913
+    (0.070, (0.006, 0.026, 0.002)),  # 132D07
+    (0.074, (0.106, 0.192, 0.009)),  # 5C7918
+    (0.078, (0.014, 0.183, 0.152)),  # 1F766D
+    (0.081, (0.043, 0.017, 0.003)),  # 3B2309
+    (0.101, (0.096, 0.0, 0.002)),  # 570006
+    (0.173, (0.333, 0.07, 0.0)),  # 9C4B00
+    (0.178, (0.282, 0.0, 0.0)),  # 910000
+    (0.2, (0.002, 0.011, 0.042)),  # 071B3A
+    (0.278, (0.006, 0.054, 0.264)),  # 11428C
+    (0.3, (0.187, 0.187, 0.187)),  # 787878
+    (0.45, (0.037, 0.037, 0.037)),  # 363636
+    (0.6, (0.558, 0.558, 0.558)),  # C5C5C5
+    (0.8, (0.004, 0.004, 0.004)),  # 0E0E0E
+)
 
 
 PARTICLE_SYSTEM_PREFIX = f"engon_{polib.asset_pack.PARTICLE_SYSTEM_TOKEN}_"
@@ -271,3 +297,9 @@ def gather_instanced_objects(
                 and instance_collection is not None
             ):
                 yield from instance_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
+    return TQ_COLOR_DISTRIBUTION[idx][1]

blend_maintenance/asset_changes.py

@@ -27,6 +27,31 @@ class AssetPackMigrations(typing.NamedTuple):
 
 # versions in the names reflect the last version of asset pack without given changes
 
+_botaniq_7_0_0_larix_decidua_variant = {
+    r"^bq_Tree_Larix-decidua_([ABC])_spring-summer-autumn": r"bq_Tree_Larix-decidua_\1_spring-summer",
+}
+
+botaniq_7_0_0_larix_decidua_variant = AssetPackMigration(
+    [
+        RegexMapping(re.compile(f"{pattern}.blend$"), f"{replacement}.blend")
+        for pattern, replacement in _botaniq_7_0_0_larix_decidua_variant.items()
+    ],
+    {
+        "collections": [
+            RegexMapping(re.compile(pattern), replacement)
+            for pattern, replacement in _botaniq_7_0_0_larix_decidua_variant.items()
+        ],
+        "meshes": [
+            RegexMapping(re.compile(pattern), replacement)
+            for pattern, replacement in _botaniq_7_0_0_larix_decidua_variant.items()
+        ],
+        "objects": [
+            RegexMapping(re.compile(pattern), replacement)
+            for pattern, replacement in _botaniq_7_0_0_larix_decidua_variant.items()
+        ],
+    },
+)
+
 _botaniq_7_0_0_drop_with_in_pps_names = {
     r"^bq_pps_Grass_With-flowers_A_spring-summer": r"bq_pps_Grass_Wildflowers_A_spring-summer",
     r"^bq_pps_Grass_With-flowers_B_spring-summer": r"bq_pps_Grass_Flowers-decorative_B_spring-summer",
@@ -349,6 +374,7 @@ class AssetPackMigrations(typing.NamedTuple):
             botaniq_6_8_0_decapitalize_cortaderia,
             botaniq_7_0_0_drop_dead_from_leaf_names,
             botaniq_7_0_0_drop_with_in_pps_names,
+            botaniq_7_0_0_larix_decidua_variant,
         ],
     ),
     AssetPackMigrations(

blender_manifest.toml

@@ -1,7 +1,7 @@
 schema_version = "1.0.0"
 
 id = "engon"
-version = "1.5.0"
+version = "1.5.1"
 name = "engon"
 tagline = "Browse assets, filter and sort, scatter, animate, adjust rigs"
 maintainer = "polygoniq <[email protected]>"

clicker.py

@@ -21,7 +21,7 @@
 # Code inspired by the 'CLICKR' addon by Oliver J Post
 
 import bpy
-import bpy_extras
+import bpy_extras.view3d_utils
 import math
 import mathutils
 import typing
@@ -98,10 +98,6 @@ def __init__(self, *args, **kwargs):
         # Properties controlling the UI state - e. g. tint of the buttons, based on the events
         self.is_scaling = False
 
-        Clicker.draw_2d_handler_ref = bpy.types.SpaceView3D.draw_handler_add(
-            self.draw_px, (), 'WINDOW', 'POST_PIXEL'
-        )
-
     @staticmethod
     def remove_draw_handlers() -> None:
         if hasattr(Clicker, "draw_2d_handler_ref") and Clicker.draw_2d_handler_ref is not None:
@@ -158,7 +154,12 @@ def draw_px(self):
 
     @classmethod
     def poll(cls, context: bpy.types.Context) -> bool:
-        return len(context.selected_objects) > 0 and context.mode == 'OBJECT'
+        return (
+            context.region_data is not None
+            and isinstance(context.region_data, bpy.types.RegionView3D)
+            and len(context.selected_objects) > 0
+            and context.mode == 'OBJECT'
+        )
 
     def execute(self, context: bpy.types.Context):
         return {'FINISHED'}
@@ -210,7 +211,7 @@ def modal(self, context: bpy.types.Context, event: bpy.types.Event):
             context.window.cursor_modal_restore()
             return {'PASS_THROUGH'}
 
-        if area is not None and area.type != 'VIEW_3D':
+        if area is None or area.type != 'VIEW_3D':
             context.window.cursor_modal_set('STOP')
             return {'RUNNING_MODAL'}
 
@@ -473,6 +474,13 @@ def invoke(self, context: bpy.types.Context, event: bpy.types.Event):
         self.models_collection.hide_viewport = True
 
         self.choose_next_object(context)
+
+        # Register the draw handler for the clicker help UI
+        assert Clicker.draw_2d_handler_ref is None, "Clicker draw handler is already registered!"
+        Clicker.draw_2d_handler_ref = bpy.types.SpaceView3D.draw_handler_add(
+            self.draw_px, (), 'WINDOW', 'POST_PIXEL'
+        )
+
         context.window_manager.modal_handler_add(self)
         Clicker.is_running = True
         logger.info(

features/botaniq_animations/animations.py

@@ -283,7 +283,14 @@ def copy_animation_data(source: bpy.types.Object, target: bpy.types.Object) -> b
     if target.animation_data is None:
         target.animation_data_create()
     assert target.animation_data is not None
-    target.animation_data.action = source.animation_data.action.copy()
+    action_copy = source.animation_data.action.copy()
+    target.animation_data.action = action_copy
+    # Force assign an action to a slot. In blender 4.4+ slots were introduced and in some cases
+    # assigning an action fails to auto-assign a slot. We force assign a slot to prevent leaving
+    # the datablocks in non-animated state
+    # https://developer.blender.org/docs/release_notes/4.4/python_api/#breaking
+    if bpy.app.version >= (4, 4, 0):
+        target.animation_data.action_slot = action_copy.slots[0]
     animation_type = source.animation_data.action.name.rsplit("_", 1)[0]
     target.animation_data.action.name = f"{animation_type}_Instance"
     return target.animation_data.action
@@ -586,12 +593,12 @@ def change_preset(
     """Changes preset of 'obj' by switching the action of the same animation type to 'preset'"""
     anim_type, _ = parse_action_name(obj.animation_data.action)
     anim_library = bpy.data.libraries.get(os.path.basename(animation_library_path), None)
-    if anim_library is None:
+    preset_action_name = f"bq_{anim_type}_{preset}"
+    if anim_library is None or preset_action_name not in bpy.data.actions:
         anim_library, _, _ = link_animation_data(anim_type, animation_library_path)
 
     assert anim_library is not None
 
-    preset_action_name = f"bq_{anim_type}_{preset}"
     preset_action = bpy.data.actions.get((preset_action_name, anim_library.filepath), None)
     assert preset_action is not None
 
@@ -618,6 +625,12 @@ def change_preset(
     new_action = preset_action.copy()
     assert obj.animation_data is not None
     obj.animation_data.action = new_action
+    # Force assign an action to a slot. In blender 4.4+ slots were introduced and in some cases
+    # assigning an action fails to auto-assign a slot. We force assign a slot to prevent leaving
+    # the datablocks in non-animated state
+    # https://developer.blender.org/docs/release_notes/4.4/python_api/#breaking
+    if bpy.app.version >= (4, 4, 0):
+        obj.animation_data.action_slot = new_action.slots[0]
 
     set_animation_strength(new_action, strength)
     # We know here that helper_objs didn't change while changing preset thus they should have
@@ -1528,7 +1541,14 @@ def duplicate_animation_instance(
         # data is linked into it. This new collection can be used for further instantiation.
         previous_object = original_collection.objects[0]
         new_object = polib.asset_pack_bpy.copy_object_hierarchy(previous_object)
-        new_object.animation_data.action = new_object.animation_data.action.copy()
+        new_action = new_object.animation_data.action.copy()
+        new_object.animation_data.action = new_action
+        # Force assign an action to a slot. In blender 4.4+ slots were introduced and in some cases
+        # assigning an action fails to auto-assign a slot. We force assign a slot to prevent leaving
+        # the datablocks in non-animated state
+        # https://developer.blender.org/docs/release_notes/4.4/python_api/#breaking
+        if bpy.app.version >= (4, 4, 0):
+            new_object.animation_data.action_slot = new_action.slots[0]
 
         new_collection = original_collection.copy()
         polib.asset_pack_bpy.collection_unlink_hierarchy(new_collection, previous_object)

features/botaniq_animations/botaniq_animations.py

@@ -22,6 +22,7 @@
 import typing
 import os
 import enum
+import logging
 
 from bpy.types import ID
 from . import animations
@@ -30,6 +31,7 @@
 from ... import polib
 from ... import preferences
 
+logger = logging.getLogger(f"polygoniq.{__name__}")
 
 MODULE_CLASSES = []
 
@@ -413,6 +415,11 @@ def draw(self, context: bpy.types.Context):
         for mod_name, fmod_limits in sorted(
             animations.get_animation_state_control_modifiers(action), key=lambda x: x[0]
         ):
+            modifier = animated_object.modifiers.get(mod_name, None)
+            if modifier is None:
+                logger.warning(f"Modifier {mod_name} not found on object {animated_object.name}")
+                continue
+
             row = col.row(align=True)
             row.label(text=f"{mod_name[len('bq_'):]}")
 
@@ -424,7 +431,7 @@ def draw(self, context: bpy.types.Context):
             else:
                 amplitude_col.label(text="Not Controllable")
 
-            row.prop(animated_object.modifiers[mod_name], "show_viewport", text="")
+            row.prop(modifier, "show_viewport", text="")
             # For some reason next icon from the desired one has to be used: AUTO => CHECKMARK
             row.prop(
                 fmod_limits, "mute", text="", icon='AUTO' if fmod_limits.mute is True else 'BLANK1'