Merge branch 'aws-deadline:mainline' into tile_rendering_checkbox

Author: gianelli-lagos-aws

DEVELOPMENT.md

@@ -241,7 +241,8 @@ For redshift licensing, set the environment variable by using `$env:redshift_LIC
    1. `set C4D_LOCATION=<Cinema 4D location>` on Windows Command or `$env:C4D_LOCATION = <Cinema 4D location>` on Windows Powershell.
       1. The default location for `Cinema 4D` on Windows is `C:\Program Files\Maxon Cinema 4D 2025\`. This location would be automatically used if the directory exists.
 2. For running the adaptor tests, we would need to install `pywin32` to the installation paths as its an adaptor dependency.
-   2.1 Run `pip install pywin32==308 -t <your Python site-packages location>`. 
-   During my testing, pywin32's version 308 was required because of other dependencies requiring this version.
+   2.1 Run `pip install pywin32==308 -t <your Python site-packages location>`
+       * e.g. `pip install pywin32==308 -t "C:\Program Files\Maxon Cinema 4D 2025\resource\modules\python\libs\win64\lib\site-packages"`
+   During testing, pywin32's version 308 was required because of other dependencies requiring this version.
 3. Run `hatch run integ:test`
 

src/deadline/cinema4d_adaptor/Cinema4DClient/cinema4d_client.py

@@ -88,30 +88,25 @@ def map_path(self, path: str) -> str:
             # If submission was not from Mac (i.e. not posix source format), just do normal path mapping
             if not has_posix_format:
                 mapped_path = super().map_path(path)
-                print(f"Using normal path mapping (non-POSIX): '{path}' -> '{mapped_path}'")
                 return mapped_path
 
             print(
                 "Found POSIX format rule, converting path separators for Mac to Windows compatibility"
             )
-            print(f"Original path: '{path}'")
 
             # Convert backslashes to forward slashes for consistency with POSIX paths.
             # This is safe because:
             # 1. When submitting from Mac, backslashes can only appear as path separators
             # 2. Windows accepts both '\' and '/' as valid path separators
             converted_path = path.replace("\\", "/")
-            print(f"Converted path: '{converted_path}'")
 
             # Try path mapping with converted path
             mapped_path = super().map_path(converted_path)
 
             # If mapped path is the same as converted path, mapping failed
             # so try with original path instead
             if mapped_path == converted_path:
-                print("Path mapping with converted path failed (no rules matched)")
                 mapped_path = super().map_path(path)
-                print(f"Using original path mapping: '{path}' -> '{mapped_path}'")
                 return mapped_path
 
             print(f"Successfully mapped converted path: '{converted_path}' -> '{mapped_path}'")

src/deadline/cinema4d_adaptor/Cinema4DClient/cinema4d_handler.py

@@ -77,10 +77,6 @@ def _remap_assets(self) -> None:
             # whether we have done owner[param_id] = mapped_path
             attempted_basic_path_mapping_approach = False
             try:
-                print(
-                    f"Attempting to update path for asset with owner '{owner}', paramId '{param_id}', "
-                    f"new filename '{mapped_path}', nodeSpace '{node_space}', and nodePath '{node_path}'."
-                )
                 success = self._pathmap_recognized_types(
                     owner, param_id, node_space, node_path, mapped_path
                 )
@@ -199,7 +195,6 @@ def _pathmap_base_material(self, owner, node_space, node_path, mapped_path) -> b
         return True
 
     def start_render(self, data: dict) -> None:
-        self.doc = c4d.documents.GetActiveDocument()
         self.render_data = self.doc.GetActiveRenderData()
         self.render_data[c4d.RDATA_FRAMESEQUENCE] = c4d.RDATA_FRAMESEQUENCE_MANUAL
         frame = int(self.render_kwargs.get("frame", data["frame"]))
@@ -218,8 +213,6 @@ def start_render(self, data: dict) -> None:
                 self.render_data[c4d.RDATA_MULTIPASS_FILENAME]
             )
 
-        self._remap_assets()
-
         bm = bitmaps.MultipassBitmap(
             int(self.render_data[c4d.RDATA_XRES]),
             int(self.render_data[c4d.RDATA_YRES]),
@@ -325,3 +318,5 @@ def set_scene_file(self, data: dict) -> None:
 
             c4d.documents.InsertBaseDocument(doc)
             c4d.documents.SetActiveDocument(doc)
+            self.doc = doc
+            self._remap_assets()