From 9d8ed55ea5577aa3abbbad768573778f1e3cf03a Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Tue, 18 Apr 2023 11:07:07 +0100
Subject: [PATCH] Fix nested model instances.

---
 .../maya/plugins/publish/collect_review.py    | 58 +++++++++----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/openpype/hosts/maya/plugins/publish/collect_review.py b/openpype/hosts/maya/plugins/publish/collect_review.py
index fcb188734f..7ea91afdfc 100644
--- a/openpype/hosts/maya/plugins/publish/collect_review.py
+++ b/openpype/hosts/maya/plugins/publish/collect_review.py
@@ -36,6 +36,30 @@ class CollectReview(pyblish.api.InstancePlugin):
         context = instance.context
         objectset = context.data['objectsets']
 
+        # Convert enum attribute index to string for Display Lights.
+        index = instance.data.get("displayLights", 0)
+        display_lights = lib.DISPLAY_LIGHTS_VALUES[index]
+        if display_lights == "project_settings":
+            settings = instance.context.data["project_settings"]
+            settings = settings["maya"]["publish"]["ExtractPlayblast"]
+            settings = settings["capture_preset"]["Viewport Options"]
+            display_lights = settings["displayLights"]
+
+        # Collect camera focal length.
+        burninDataMembers = instance.data.get("burninDataMembers", {})
+        if camera is not None:
+            attr = camera + ".focalLength"
+            if lib.get_attribute_input(attr):
+                start = instance.data["frameStart"]
+                end = instance.data["frameEnd"] + 1
+                time_range = range(int(start), int(end))
+                focal_length = [cmds.getAttr(attr, time=t) for t in time_range]
+            else:
+                focal_length = cmds.getAttr(attr)
+
+            burninDataMembers["focalLength"] = focal_length
+
+        # Account for nested instances like model.
         reviewable_subsets = list(set(members) & set(objectset))
         if reviewable_subsets:
             if len(reviewable_subsets) > 1:
@@ -77,6 +101,8 @@ class CollectReview(pyblish.api.InstancePlugin):
             data["isolate"] = instance.data["isolate"]
             data["panZoom"] = instance.data.get("panZoom", False)
             data["panel"] = instance.data["panel"]
+            data["displayLights"] = display_lights
+            data["burninDataMembers"] = burninDataMembers
 
             # The review instance must be active
             cmds.setAttr(str(instance) + '.active', 1)
@@ -103,6 +129,8 @@ class CollectReview(pyblish.api.InstancePlugin):
                 instance.data["frameStartHandle"]
             instance.data['frameEndFtrack'] = \
                 instance.data["frameEndHandle"]
+            instance.data["displayLights"] = display_lights
+            instance.data["burninDataMembers"] = burninDataMembers
 
             # make ftrack publishable
             instance.data.setdefault("families", []).append('ftrack')
@@ -144,33 +172,3 @@ class CollectReview(pyblish.api.InstancePlugin):
                         audio_data.append(get_audio_node_data(node))
 
             instance.data["audio"] = audio_data
-
-        # Convert enum attribute index to string.
-        index = instance.data.get("displayLights", 0)
-        display_lights = lib.DISPLAY_LIGHTS_VALUES[index]
-        if display_lights == "project_settings":
-            settings = instance.context.data["project_settings"]
-            settings = settings["maya"]["publish"]["ExtractPlayblast"]
-            settings = settings["capture_preset"]["Viewport Options"]
-            display_lights = settings["displayLights"]
-        instance.data["displayLights"] = display_lights
-
-        # Collect focal length.
-        if camera is None:
-            return
-
-        attr = camera + ".focalLength"
-        if lib.get_attribute_input(attr):
-            start = instance.data["frameStart"]
-            end = instance.data["frameEnd"] + 1
-            focal_length = [
-                cmds.getAttr(attr, time=t) for t in range(int(start), int(end))
-            ]
-        else:
-            focal_length = cmds.getAttr(attr)
-
-        key = "focalLength"
-        try:
-            instance.data["burninDataMembers"][key] = focal_length
-        except KeyError:
-            instance.data["burninDataMembers"] = {key: focal_length}