Merge branch 'develop' into max_tweaks

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -35,6 +35,8 @@ body:
       label: Version
       description: What version are you running? Look to OpenPype Tray
       options:
+        - 3.18.7-nightly.4
+        - 3.18.7-nightly.3
         - 3.18.7-nightly.2
         - 3.18.7-nightly.1
         - 3.18.6
@@ -133,8 +135,6 @@ body:
         - 3.15.10
         - 3.15.10-nightly.2
         - 3.15.10-nightly.1
-        - 3.15.9
-        - 3.15.9-nightly.2
     validations:
       required: true
   - type: dropdown

openpype/hosts/max/api/pipeline.py

@@ -59,6 +59,8 @@ class MaxHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
 
         rt.callbacks.addScript(rt.Name('filePostOpen'),
                                lib.check_colorspace)
+        rt.callbacks.addScript(rt.Name('postWorkspaceChange'),
+                               self._deferred_menu_creation)
 
     def workfile_has_unsaved_changes(self):
         return rt.getSaveRequired()

openpype/hosts/maya/api/lib.py

@@ -3142,119 +3142,6 @@ def fix_incompatible_containers():
                          "ReferenceLoader", type="string")
 
 
-def _null(*args):
-    pass
-
-
-class shelf():
-    '''A simple class to build shelves in maya. Since the build method is empty,
-    it should be extended by the derived class to build the necessary shelf
-    elements. By default it creates an empty shelf called "customShelf".'''
-
-    ###########################################################################
-    '''This is an example shelf.'''
-    # class customShelf(_shelf):
-    #     def build(self):
-    #         self.addButon(label="button1")
-    #         self.addButon("button2")
-    #         self.addButon("popup")
-    #         p = cmds.popupMenu(b=1)
-    #         self.addMenuItem(p, "popupMenuItem1")
-    #         self.addMenuItem(p, "popupMenuItem2")
-    #         sub = self.addSubMenu(p, "subMenuLevel1")
-    #         self.addMenuItem(sub, "subMenuLevel1Item1")
-    #         sub2 = self.addSubMenu(sub, "subMenuLevel2")
-    #         self.addMenuItem(sub2, "subMenuLevel2Item1")
-    #         self.addMenuItem(sub2, "subMenuLevel2Item2")
-    #         self.addMenuItem(sub, "subMenuLevel1Item2")
-    #         self.addMenuItem(p, "popupMenuItem3")
-    #         self.addButon("button3")
-    # customShelf()
-    ###########################################################################
-
-    def __init__(self, name="customShelf", iconPath="", preset={}):
-        self.name = name
-
-        self.iconPath = iconPath
-
-        self.labelBackground = (0, 0, 0, 0)
-        self.labelColour = (.9, .9, .9)
-
-        self.preset = preset
-
-        self._cleanOldShelf()
-        cmds.setParent(self.name)
-        self.build()
-
-    def build(self):
-        '''This method should be overwritten in derived classes to actually
-        build the shelf elements. Otherwise, nothing is added to the shelf.'''
-        for item in self.preset['items']:
-            if not item.get('command'):
-                item['command'] = self._null
-            if item['type'] == 'button':
-                self.addButon(item['name'],
-                              command=item['command'],
-                              icon=item['icon'])
-            if item['type'] == 'menuItem':
-                self.addMenuItem(item['parent'],
-                                 item['name'],
-                                 command=item['command'],
-                                 icon=item['icon'])
-            if item['type'] == 'subMenu':
-                self.addMenuItem(item['parent'],
-                                 item['name'],
-                                 command=item['command'],
-                                 icon=item['icon'])
-
-    def addButon(self, label, icon="commandButton.png",
-                 command=_null, doubleCommand=_null):
-        '''
-            Adds a shelf button with the specified label, command,
-            double click command and image.
-        '''
-        cmds.setParent(self.name)
-        if icon:
-            icon = os.path.join(self.iconPath, icon)
-            print(icon)
-        cmds.shelfButton(width=37, height=37, image=icon, label=label,
-                         command=command, dcc=doubleCommand,
-                         imageOverlayLabel=label, olb=self.labelBackground,
-                         olc=self.labelColour)
-
-    def addMenuItem(self, parent, label, command=_null, icon=""):
-        '''
-            Adds a shelf button with the specified label, command,
-            double click command and image.
-        '''
-        if icon:
-            icon = os.path.join(self.iconPath, icon)
-            print(icon)
-        return cmds.menuItem(p=parent, label=label, c=command, i="")
-
-    def addSubMenu(self, parent, label, icon=None):
-        '''
-            Adds a sub menu item with the specified label and icon to
-            the specified parent popup menu.
-        '''
-        if icon:
-            icon = os.path.join(self.iconPath, icon)
-            print(icon)
-        return cmds.menuItem(p=parent, label=label, i=icon, subMenu=1)
-
-    def _cleanOldShelf(self):
-        '''
-            Checks if the shelf exists and empties it if it does
-            or creates it if it does not.
-        '''
-        if cmds.shelfLayout(self.name, ex=1):
-            if cmds.shelfLayout(self.name, q=1, ca=1):
-                for each in cmds.shelfLayout(self.name, q=1, ca=1):
-                    cmds.deleteUI(each)
-        else:
-            cmds.shelfLayout(self.name, p="ShelfLayout")
-
-
 def update_content_on_context_change():
     """
     This will update scene content to match new asset on context change

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

@@ -7,6 +7,7 @@ from openpype.hosts.maya.api import lib
 from openpype.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
+    PublishValidationError
 )
 
 
@@ -38,7 +39,8 @@ class ValidateRigJointsHidden(pyblish.api.InstancePlugin):
         invalid = self.get_invalid(instance)
 
         if invalid:
-            raise ValueError("Visible joints found: {0}".format(invalid))
+            raise PublishValidationError(
+                "Visible joints found: {0}".format(invalid))
 
     @classmethod
     def repair(cls, instance):

openpype/hosts/maya/startup/userSetup.py

@@ -46,24 +46,5 @@ if bool(int(os.environ.get(key, "0"))):
         lowestPriority=True
     )
 
-# Build a shelf.
-shelf_preset = settings['maya'].get('project_shelf')
-if shelf_preset:
-    icon_path = os.path.join(
-        os.environ['OPENPYPE_PROJECT_SCRIPTS'],
-        project_name,
-        "icons")
-    icon_path = os.path.abspath(icon_path)
-
-    for i in shelf_preset['imports']:
-        import_string = "from {} import {}".format(project_name, i)
-        print(import_string)
-        exec(import_string)
-
-    cmds.evalDeferred(
-        "mlib.shelf(name=shelf_preset['name'], iconPath=icon_path,"
-        " preset=shelf_preset)"
-    )
-
 
 print("Finished OpenPype usersetup.")

openpype/hosts/nuke/api/plugin.py

@@ -1348,7 +1348,9 @@ def _remove_old_knobs(node):
 
 
 def exposed_write_knobs(settings, plugin_name, instance_node):
-    exposed_knobs = settings["nuke"]["create"][plugin_name]["exposed_knobs"]
+    exposed_knobs = settings["nuke"]["create"][plugin_name].get(
+        "exposed_knobs", []
+    )
     if exposed_knobs:
         instance_node.addKnob(nuke.Text_Knob('', 'Write Knobs'))
     write_node = nuke.allNodes(group=instance_node, filter="Write")[0]

openpype/hosts/nuke/plugins/publish/validate_exposed_knobs.py

@@ -65,7 +65,7 @@ class ValidateExposedKnobs(
         group_node = instance.data["transientData"]["node"]
         nuke_settings = instance.context.data["project_settings"]["nuke"]
         create_settings = nuke_settings["create"][plugin]
-        exposed_knobs = create_settings["exposed_knobs"]
+        exposed_knobs = create_settings.get("exposed_knobs", [])
         unexposed_knobs = []
         for knob in exposed_knobs:
             if knob not in group_node.knobs():

openpype/hosts/resolve/api/lib.py

@@ -713,6 +713,11 @@ def swap_clips(from_clip, to_clip, to_in_frame, to_out_frame):
         bool: True if successfully replaced
 
     """
+    # copy ACES input transform from timeline clip to new media item
+    mediapool_item_from_timeline = from_clip.GetMediaPoolItem()
+    _idt = mediapool_item_from_timeline.GetClipProperty('IDT')
+    to_clip.SetClipProperty('IDT', _idt)
+
     _clip_prop = to_clip.GetClipProperty
     to_clip_name = _clip_prop("File Name")
     # add clip item as take to timeline

openpype/hosts/resolve/api/plugin.py

@@ -477,14 +477,16 @@ class ClipLoader:
         )
         _clip_property = media_pool_item.GetClipProperty
 
-        source_in = int(_clip_property("Start"))
-        source_out = int(_clip_property("End"))
+        # Read trimming from timeline item
+        timeline_item_in = timeline_item.GetLeftOffset()
+        timeline_item_len = timeline_item.GetDuration()
+        timeline_item_out = timeline_item_in + timeline_item_len
 
         lib.swap_clips(
             timeline_item,
             media_pool_item,
-            source_in,
-            source_out
+            timeline_item_in,
+            timeline_item_out
         )
 
         print("Loading clips: `{}`".format(self.data["clip_name"]))

openpype/plugins/publish/extract_thumbnail.py

@@ -2,6 +2,7 @@ import copy
 import os
 import subprocess
 import tempfile
+import re
 
 import pyblish.api
 from openpype.lib import (
@@ -14,9 +15,10 @@ from openpype.lib import (
     path_to_subprocess_arg,
     run_subprocess,
 )
-from openpype.lib.transcoding import convert_colorspace
-
-from openpype.lib.transcoding import VIDEO_EXTENSIONS
+from openpype.lib.transcoding import (
+    convert_colorspace,
+    VIDEO_EXTENSIONS,
+)
 
 
 class ExtractThumbnail(pyblish.api.InstancePlugin):
@@ -35,6 +37,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         "traypublisher",
         "substancepainter",
         "nuke",
+        "aftereffects"
     ]
     enabled = False
 
@@ -49,6 +52,8 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
     # attribute presets from settings
     oiiotool_defaults = None
     ffmpeg_args = None
+    subsets = []
+    product_names = []
 
     def process(self, instance):
         # run main process
@@ -103,6 +108,26 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
             self.log.debug("Skipping crypto passes.")
             return
 
+        # We only want to process the subsets needed from settings.
+        def validate_string_against_patterns(input_str, patterns):
+            for pattern in patterns:
+                if re.match(pattern, input_str):
+                    return True
+            return False
+
+        product_names = self.subsets + self.product_names
+        if product_names:
+            result = validate_string_against_patterns(
+                instance.data["subset"], product_names
+            )
+            if not result:
+                self.log.debug(
+                    "Subset \"{}\" did not match any valid subsets: {}".format(
+                        instance.data["subset"], product_names
+                    )
+                )
+                return
+
         # first check for any explicitly marked representations for thumbnail
         explicit_repres = self._get_explicit_repres_for_thumbnail(instance)
         if explicit_repres:

openpype/settings/defaults/project_settings/global.json

@@ -70,6 +70,7 @@
         },
         "ExtractThumbnail": {
             "enabled": true,
+            "subsets": [],
             "integrate_thumbnail": false,
             "background_color": [
                 0,

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

@@ -202,6 +202,12 @@
                     "key": "enabled",
                     "label": "Enabled"
                 },
+                {
+                    "type": "list",
+                    "object_type": "text",
+                    "key": "subsets",
+                    "label": "Subsets"
+                },
                 {
                     "type": "boolean",
                     "key": "integrate_thumbnail",

openpype/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.18.7-nightly.2"
+__version__ = "3.18.7-nightly.4"

server_addon/core/server/settings/publish_plugins.py

@@ -176,6 +176,10 @@ class ExtractThumbnailOIIODefaultsModel(BaseSettingsModel):
 class ExtractThumbnailModel(BaseSettingsModel):
     _isGroup = True
     enabled: bool = SettingsField(True)
+    product_names: list[str] = SettingsField(
+        default_factory=list,
+        title="Product names"
+    )
     integrate_thumbnail: bool = SettingsField(
         True,
         title="Integrate Thumbnail Representation"
@@ -844,6 +848,7 @@ DEFAULT_PUBLISH_VALUES = {
     },
     "ExtractThumbnail": {
         "enabled": True,
+        "product_names": [],
         "integrate_thumbnail": True,
         "target_size": {
             "type": "source"

server_addon/core/server/version.py

@@ -1 +1 @@
-__version__ = "0.1.4"
+__version__ = "0.1.5"