Merge pull request #4145 from tokejepsen/enhancement/maya_review

openpype/hosts/maya/api/lib.py

@@ -117,6 +117,18 @@ FLOAT_FPS = {23.98, 23.976, 29.97, 47.952, 59.94}
 
 RENDERLIKE_INSTANCE_FAMILIES = ["rendering", "vrayscene"]
 
+DISPLAY_LIGHTS_VALUES = [
+    "project_settings", "default", "all", "selected", "flat", "none"
+]
+DISPLAY_LIGHTS_LABELS = [
+    "Use Project Settings",
+    "Default Lighting",
+    "All Lights",
+    "Selected Lights",
+    "Flat Lighting",
+    "No Lights"
+]
+
 
 def get_main_window():
     """Acquire Maya's main window"""

openpype/hosts/maya/plugins/create/create_review.py

@@ -47,5 +47,6 @@ class CreateReview(plugin.Creator):
         data["imagePlane"] = self.imagePlane
         data["transparency"] = self.transparency
         data["panZoom"] = self.panZoom
+        data["displayLights"] = lib.DISPLAY_LIGHTS_LABELS
 
         self.data = data

openpype/hosts/maya/plugins/publish/collect_review.py

@@ -4,7 +4,7 @@ import pyblish.api
 
 from openpype.client import get_subset_by_name
 from openpype.pipeline import legacy_io, KnownPublishError
-from openpype.hosts.maya.api.lib import get_attribute_input
+from openpype.hosts.maya.api import lib
 
 
 class CollectReview(pyblish.api.InstancePlugin):
@@ -156,9 +156,19 @@ class CollectReview(pyblish.api.InstancePlugin):
 
             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.
         attr = camera + ".focalLength"
-        if get_attribute_input(attr):
+        if lib.get_attribute_input(attr):
             start = instance.data["frameStart"]
             end = instance.data["frameEnd"] + 1
             focal_length = [

openpype/hosts/maya/plugins/publish/extract_playblast.py

@@ -115,6 +115,10 @@ class ExtractPlayblast(publish.Extractor):
         cmds.currentTime(refreshFrameInt - 1, edit=True)
         cmds.currentTime(refreshFrameInt, edit=True)
 
+        # Use displayLights setting from instance
+        key = "displayLights"
+        preset["viewport_options"][key] = instance.data[key]
+
         # Override transparency if requested.
         transparency = instance.data.get("transparency", 0)
         if transparency != 0:

openpype/hosts/maya/plugins/publish/extract_thumbnail.py

@@ -104,6 +104,10 @@ class ExtractThumbnail(publish.Extractor):
         cmds.currentTime(refreshFrameInt - 1, edit=True)
         cmds.currentTime(refreshFrameInt, edit=True)
 
+        # Use displayLights setting from instance
+        key = "displayLights"
+        preset["viewport_options"][key] = instance.data[key]
+
         # Override transparency if requested.
         transparency = instance.data.get("transparency", 0)
         if transparency != 0:

openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json

@@ -176,7 +176,7 @@
                                 { "all": "All Lights"},
                                 { "selected": "Selected Lights"},
                                 { "flat": "Flat Lighting"},
-                                { "nolights": "No Lights"}
+                                { "none": "No Lights"}
                             ]
                         },
                         {