Fix Blender 4.2+ EEVEE engine compatibility

Blender 4.2+ replaced BLENDER_EEVEE with BLENDER_EEVEE_NEXT.
This commit adds version-aware engine selection to support both versions.

Changes:
- utils/blender_version.py: Added get_eevee_engine_name() helper
- config.py: Updated RenderConfig to use version-aware default engine
- config.py: Added BLENDER_EEVEE_NEXT to valid render engines
- All test files: Updated to use get_eevee_engine_name() instead of hardcoded strings
- test_e2e_validation.py: Updated engine check to handle both EEVEE variants

This fixes GitHub Actions failures on Blender 4.2 container tests.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: zbuc

blender_blocking/config.py

@@ -5,6 +5,8 @@
 from dataclasses import dataclass, field
 from typing import Dict, Optional, Tuple
 
+from utils.blender_version import get_eevee_engine_name
+
 
 _VALID_RECON_MODES = {"legacy", "loft_profile", "silhouette_intersection"}
 _VALID_JOIN_MODES = {"auto", "boolean", "voxel", "simple"}
@@ -13,7 +15,7 @@
 _VALID_FILL_STRATEGIES = {"interp_linear", "interp_nearest", "constant"}
 _VALID_CANON_ANCHORS = {"center", "bottom_center"}
 _VALID_CANON_INTERP = {"nearest"}
-_VALID_RENDER_ENGINES = {"BLENDER_EEVEE", "WORKBENCH"}
+_VALID_RENDER_ENGINES = {"BLENDER_EEVEE", "BLENDER_EEVEE_NEXT", "WORKBENCH"}
 _VALID_COLOR_MODES = {"BW", "RGBA"}
 _VALID_CONTOUR_MODES = {"external", "ccomp", "tree", "hierarchy"}
 _VALID_BOOLEAN_SOLVERS = {"auto", "EXACT", "MANIFOLD", "FLOAT", "FAST"}
@@ -124,7 +126,7 @@ class RenderConfig:
     """Configuration for rendering orthographic silhouettes."""
 
     resolution: Tuple[int, int] = (512, 512)
-    engine: str = "BLENDER_EEVEE"
+    engine: str = field(default_factory=get_eevee_engine_name)
     transparent_bg: bool = True
     samples: int = 1
     margin_frac: float = 0.08

blender_blocking/generate_turntable_sequence.py

@@ -27,6 +27,7 @@
     set_camera_top,
     silhouette_session,
 )
+from utils.blender_version import get_eevee_engine_name
 
 
 def clear_scene() -> None:
@@ -161,7 +162,7 @@ def generate_turntable_sequence(
         resolution=(512, 512),
         color_mode="BW",
         transparent_bg=False,
-        engine="BLENDER_EEVEE",
+        engine=get_eevee_engine_name(),
         background_color=(1.0, 1.0, 1.0, 1.0),
         silhouette_color=(0.0, 0.0, 0.0, 1.0),
     ) as session:

blender_blocking/test_e2e_validation.py

@@ -44,6 +44,7 @@
     render_orthogonal_views,
 )
 from blender_blocking.integration.image_processing.image_loader import load_image
+from blender_blocking.utils.blender_version import get_eevee_engine_name
 from blender_blocking.validation.silhouette_iou import (
     canonicalize_mask,
     compute_mask_iou,
@@ -101,7 +102,7 @@ def setup_render_settings(self) -> None:
 
         # Fast rendering (we only need silhouettes)
         scene.render.engine = config.engine
-        if config.engine == "BLENDER_EEVEE" and hasattr(scene, "eevee"):
+        if config.engine in ("BLENDER_EEVEE", "BLENDER_EEVEE_NEXT") and hasattr(scene, "eevee"):
             scene.eevee.taa_render_samples = int(config.samples)
 
     def extract_silhouette(self, image_path: str) -> np.ndarray:
@@ -484,8 +485,8 @@ def _parse_args(argv: Optional[list[str]] = None) -> argparse.Namespace:
     )
     parser.add_argument(
         "--engine",
-        choices=("BLENDER_EEVEE", "WORKBENCH"),
-        default="BLENDER_EEVEE",
+        choices=("BLENDER_EEVEE", "BLENDER_EEVEE_NEXT", "WORKBENCH"),
+        default=get_eevee_engine_name(),
         help="Render engine",
     )
     parser.add_argument(

blender_blocking/test_phase2_integration.py

@@ -51,6 +51,7 @@
     set_camera_top,
     silhouette_session,
 )
+from utils.blender_version import get_eevee_engine_name
 
 
 def clear_scene() -> None:
@@ -172,7 +173,7 @@ def render_turntable_silhouettes(
         resolution=(512, 512),
         color_mode="BW",
         transparent_bg=False,
-        engine="BLENDER_EEVEE",
+        engine=get_eevee_engine_name(),
         background_color=(1.0, 1.0, 1.0, 1.0),
         silhouette_color=(0.0, 0.0, 0.0, 1.0),
     ) as session:

blender_blocking/test_silhouette_rendering.py

@@ -34,6 +34,7 @@
     render_silhouette_frame,
     silhouette_session,
 )
+from utils.blender_version import get_eevee_engine_name
 
 
 def _load_mask(image_path: Path) -> np.ndarray:
@@ -80,7 +81,7 @@ def test_render_isolation(self) -> None:
             color_mode="RGBA",
             transparent_bg=False,
             hide_non_targets=True,
-            engine="BLENDER_EEVEE",
+            engine=get_eevee_engine_name(),
         ) as session:
             configure_ortho_camera_for_view(
                 session.camera,
@@ -100,7 +101,7 @@ def test_render_isolation(self) -> None:
             color_mode="RGBA",
             transparent_bg=False,
             hide_non_targets=True,
-            engine="BLENDER_EEVEE",
+            engine=get_eevee_engine_name(),
         ) as session:
             configure_ortho_camera_for_view(
                 session.camera,

blender_blocking/test_suite_multiview.py

@@ -43,6 +43,7 @@
     silhouette_session,
 )
 from integration.blender_ops.raycast_utils import ray_cast_world
+from utils.blender_version import get_eevee_engine_name
 
 
 # Test suite configuration
@@ -433,7 +434,7 @@ def render_turntable(
         resolution=(resolution, resolution),
         color_mode="BW",
         transparent_bg=False,
-        engine="BLENDER_EEVEE",
+        engine=get_eevee_engine_name(),
         background_color=(1.0, 1.0, 1.0, 1.0),
         silhouette_color=(0.0, 0.0, 0.0, 1.0),
     ) as session:

blender_blocking/utils/blender_version.py

@@ -40,6 +40,23 @@ def get_blender_version_string() -> Optional[str]:
     return bpy.app.version_string
 
 
+def get_eevee_engine_name() -> str:
+    """
+    Get the correct EEVEE engine name for the current Blender version.
+
+    Returns:
+        "BLENDER_EEVEE_NEXT" for Blender 4.2+, "BLENDER_EEVEE" for earlier versions
+    """
+    if not BLENDER_AVAILABLE:
+        return "BLENDER_EEVEE"  # Default for non-Blender context
+
+    version = bpy.app.version
+    # Blender 4.2+ uses EEVEE_NEXT, earlier versions use EEVEE
+    if version[0] >= 4 and version[1] >= 2:
+        return "BLENDER_EEVEE_NEXT"
+    return "BLENDER_EEVEE"
+
+
 def is_blender_version_at_least(major: int, minor: int = 0, patch: int = 0) -> bool:
     """
     Check if Blender version is at least the specified version.