Merge branch 'release/3.15.x' into bugfix/OP-3845_nuke-input-process-…

…node-sourcing

CHANGELOG.md

@@ -1,5 +1,58 @@
 # Changelog
 
+## [3.14.10](https://github.com/ynput/OpenPype/tree/HEAD)
+
+[Full Changelog](https://github.com/ynput/OpenPype/compare/3.14.9...HEAD)
+
+**🆕 New features**
+
+- Global | Nuke: Creator placeholders in workfile template builder [\#4266](https://github.com/ynput/OpenPype/pull/4266)
+- Slack: Added dynamic message [\#4265](https://github.com/ynput/OpenPype/pull/4265)
+- Blender: Workfile Loader [\#4234](https://github.com/ynput/OpenPype/pull/4234)
+- Unreal: Publishing and Loading for UAssets [\#4198](https://github.com/ynput/OpenPype/pull/4198)
+- Publish: register publishes without copying them [\#4157](https://github.com/ynput/OpenPype/pull/4157)
+
+**🚀 Enhancements**
+
+- General: Added install method with docstring to HostBase [\#4298](https://github.com/ynput/OpenPype/pull/4298)
+- Traypublisher: simple editorial multiple edl [\#4248](https://github.com/ynput/OpenPype/pull/4248)
+- General: Extend 'IPluginPaths' to have more available methods [\#4214](https://github.com/ynput/OpenPype/pull/4214)
+- Refactorization of folder coloring [\#4211](https://github.com/ynput/OpenPype/pull/4211)
+- Flame - loading multilayer with controlled layer names [\#4204](https://github.com/ynput/OpenPype/pull/4204)
+
+**🐛 Bug fixes**
+
+- Unreal: fix missing `maintained_selection` call [\#4300](https://github.com/ynput/OpenPype/pull/4300)
+- Ftrack: Fix receive of host ip on MacOs [\#4288](https://github.com/ynput/OpenPype/pull/4288)
+- SiteSync: sftp connection failing when shouldnt be tested [\#4278](https://github.com/ynput/OpenPype/pull/4278)
+- Deadline: fix default value for passing mongo url [\#4275](https://github.com/ynput/OpenPype/pull/4275)
+- Scene Manager: Fix variable name [\#4268](https://github.com/ynput/OpenPype/pull/4268)
+- Slack: notification fails because of missing published path [\#4264](https://github.com/ynput/OpenPype/pull/4264)
+- hiero: creator gui with min max [\#4257](https://github.com/ynput/OpenPype/pull/4257)
+- NiceCheckbox: Fix checker positioning in Python 2 [\#4253](https://github.com/ynput/OpenPype/pull/4253)
+- Publisher: Fix 'CreatorType' not equal for Python 2 DCCs [\#4249](https://github.com/ynput/OpenPype/pull/4249)
+- Deadline: fix dependencies [\#4242](https://github.com/ynput/OpenPype/pull/4242)
+- Houdini: hotfix instance data access [\#4236](https://github.com/ynput/OpenPype/pull/4236)
+- bugfix/image plane load error [\#4222](https://github.com/ynput/OpenPype/pull/4222)
+- Hiero: thumbnail from multilayer exr [\#4209](https://github.com/ynput/OpenPype/pull/4209)
+
+**🔀 Refactored code**
+
+- Resolve: Use qtpy in Resolve [\#4254](https://github.com/ynput/OpenPype/pull/4254)
+- Houdini: Use qtpy in Houdini [\#4252](https://github.com/ynput/OpenPype/pull/4252)
+- Max: Use qtpy in Max [\#4251](https://github.com/ynput/OpenPype/pull/4251)
+- Maya: Use qtpy in Maya [\#4250](https://github.com/ynput/OpenPype/pull/4250)
+- Hiero: Use qtpy in Hiero [\#4240](https://github.com/ynput/OpenPype/pull/4240)
+- Nuke: Use qtpy in Nuke [\#4239](https://github.com/ynput/OpenPype/pull/4239)
+- Flame: Use qtpy in flame [\#4238](https://github.com/ynput/OpenPype/pull/4238)
+- General: Legacy io not used in global plugins [\#4134](https://github.com/ynput/OpenPype/pull/4134)
+
+**Merged pull requests:**
+
+- Bump json5 from 1.0.1 to 1.0.2 in /website [\#4292](https://github.com/ynput/OpenPype/pull/4292)
+- Maya: Fix validate frame range repair + fix create render with deadline disabled [\#4279](https://github.com/ynput/OpenPype/pull/4279)
+
+
 ## [3.14.9](https://github.com/pypeclub/OpenPype/tree/3.14.9)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.14.8...3.14.9)

HISTORY.md

@@ -1,5 +1,57 @@
 # Changelog
 
+## [3.14.10](https://github.com/ynput/OpenPype/tree/HEAD)
+
+[Full Changelog](https://github.com/ynput/OpenPype/compare/3.14.9...3.14.10)
+
+**🆕 New features**
+
+- Global | Nuke: Creator placeholders in workfile template builder [\#4266](https://github.com/ynput/OpenPype/pull/4266)
+- Slack: Added dynamic message [\#4265](https://github.com/ynput/OpenPype/pull/4265)
+- Blender: Workfile Loader [\#4234](https://github.com/ynput/OpenPype/pull/4234)
+- Unreal: Publishing and Loading for UAssets [\#4198](https://github.com/ynput/OpenPype/pull/4198)
+- Publish: register publishes without copying them [\#4157](https://github.com/ynput/OpenPype/pull/4157)
+
+**🚀 Enhancements**
+
+- General: Added install method with docstring to HostBase [\#4298](https://github.com/ynput/OpenPype/pull/4298)
+- Traypublisher: simple editorial multiple edl [\#4248](https://github.com/ynput/OpenPype/pull/4248)
+- General: Extend 'IPluginPaths' to have more available methods [\#4214](https://github.com/ynput/OpenPype/pull/4214)
+- Refactorization of folder coloring [\#4211](https://github.com/ynput/OpenPype/pull/4211)
+- Flame - loading multilayer with controlled layer names [\#4204](https://github.com/ynput/OpenPype/pull/4204)
+
+**🐛 Bug fixes**
+
+- Unreal: fix missing `maintained_selection` call [\#4300](https://github.com/ynput/OpenPype/pull/4300)
+- Ftrack: Fix receive of host ip on MacOs [\#4288](https://github.com/ynput/OpenPype/pull/4288)
+- SiteSync: sftp connection failing when shouldnt be tested [\#4278](https://github.com/ynput/OpenPype/pull/4278)
+- Deadline: fix default value for passing mongo url [\#4275](https://github.com/ynput/OpenPype/pull/4275)
+- Scene Manager: Fix variable name [\#4268](https://github.com/ynput/OpenPype/pull/4268)
+- Slack: notification fails because of missing published path [\#4264](https://github.com/ynput/OpenPype/pull/4264)
+- hiero: creator gui with min max [\#4257](https://github.com/ynput/OpenPype/pull/4257)
+- NiceCheckbox: Fix checker positioning in Python 2 [\#4253](https://github.com/ynput/OpenPype/pull/4253)
+- Publisher: Fix 'CreatorType' not equal for Python 2 DCCs [\#4249](https://github.com/ynput/OpenPype/pull/4249)
+- Deadline: fix dependencies [\#4242](https://github.com/ynput/OpenPype/pull/4242)
+- Houdini: hotfix instance data access [\#4236](https://github.com/ynput/OpenPype/pull/4236)
+- bugfix/image plane load error [\#4222](https://github.com/ynput/OpenPype/pull/4222)
+- Hiero: thumbnail from multilayer exr [\#4209](https://github.com/ynput/OpenPype/pull/4209)
+
+**🔀 Refactored code**
+
+- Resolve: Use qtpy in Resolve [\#4254](https://github.com/ynput/OpenPype/pull/4254)
+- Houdini: Use qtpy in Houdini [\#4252](https://github.com/ynput/OpenPype/pull/4252)
+- Max: Use qtpy in Max [\#4251](https://github.com/ynput/OpenPype/pull/4251)
+- Maya: Use qtpy in Maya [\#4250](https://github.com/ynput/OpenPype/pull/4250)
+- Hiero: Use qtpy in Hiero [\#4240](https://github.com/ynput/OpenPype/pull/4240)
+- Nuke: Use qtpy in Nuke [\#4239](https://github.com/ynput/OpenPype/pull/4239)
+- Flame: Use qtpy in flame [\#4238](https://github.com/ynput/OpenPype/pull/4238)
+- General: Legacy io not used in global plugins [\#4134](https://github.com/ynput/OpenPype/pull/4134)
+
+**Merged pull requests:**
+
+- Bump json5 from 1.0.1 to 1.0.2 in /website [\#4292](https://github.com/ynput/OpenPype/pull/4292)
+- Maya: Fix validate frame range repair + fix create render with deadline disabled [\#4279](https://github.com/ynput/OpenPype/pull/4279)
+
 
 ## [3.14.9](https://github.com/pypeclub/OpenPype/tree/3.14.9)
 

openpype/host/host.py

@@ -76,6 +76,18 @@ def __init__(self):
 
  pass
 
+ def install(self):
+ """Install host specific functionality.
+
+ This is where should be added menu with tools, registered callbacks
+ and other host integration initialization.
+
+ It is called automatically when 'openpype.pipeline.install_host' is
+ triggered.
+ """
+
+ pass
+
  @property
  def log(self):
  if self._log is None:

openpype/hosts/harmony/api/server.py

@@ -40,6 +40,7 @@ def __init__(self, port):
 
  # Create a TCP/IP socket
  self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 
  # Bind the socket to the port
  server_address = ("127.0.0.1", port)
@@ -91,7 +92,13 @@ def receive(self):
  self.log.info("wait ttt")
  # Receive the data in small chunks and retransmit it
  request = None
- header = self.connection.recv(10)
+ try:
+ header = self.connection.recv(10)
+ except OSError:
+ # could happen on MacOS
+ self.log.info("")
+ break
+
  if len(header) == 0:
  # null data received, socket is closing.
  self.log.info(f"[{self.timestamp()}] Connection closing.")

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

@@ -44,3 +44,6 @@ def __init__(self, *args, **kwargs):
  # Default to not send to farm.
  self.data["farm"] = False
  self.data["priority"] = 50
+
+ # Default to write normals.
+ self.data["writeNormals"] = True

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

@@ -6,7 +6,7 @@ class CreateMultiverseUsd(plugin.Creator):
 
  name = "mvUsdMain"
  label = "Multiverse USD Asset"
- family = "mvUsd"
+ family = "usd"
  icon = "cubes"
 
  def __init__(self, *args, **kwargs):

openpype/hosts/maya/plugins/load/load_multiverse_usd.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 import maya.cmds as cmds
+from maya import mel
+import os
 
 from openpype.pipeline import (
  load,
@@ -11,12 +13,13 @@
  unique_namespace
 )
 from openpype.hosts.maya.api.pipeline import containerise
+from openpype.client import get_representation_by_id
 
 
 class MultiverseUsdLoader(load.LoaderPlugin):
  """Read USD data in a Multiverse Compound"""
 
- families = ["model", "mvUsd", "mvUsdComposition", "mvUsdOverride",
+ families = ["model", "usd", "mvUsdComposition", "mvUsdOverride",
  "pointcache", "animation"]
  representations = ["usd", "usda", "usdc", "usdz", "abc"]
 
@@ -26,30 +29,27 @@ class MultiverseUsdLoader(load.LoaderPlugin):
  color = "orange"
 
  def load(self, context, name=None, namespace=None, options=None):
-
  asset = context['asset']['name']
  namespace = namespace or unique_namespace(
  asset + "_",
  prefix="_" if asset[0].isdigit() else "",
  suffix="_",
  )
 
- # Create the shape
+ # Make sure we can load the plugin
  cmds.loadPlugin("MultiverseForMaya", quiet=True)
+ import multiverse
 
+ # Create the shape
  shape = None
  transform = None
  with maintained_selection():
  cmds.namespace(addNamespace=namespace)
  with namespaced(namespace, new=False):
- import multiverse
  shape = multiverse.CreateUsdCompound(self.fname)
  transform = cmds.listRelatives(
  shape, parent=True, fullPath=True)[0]
 
- # Lock the shape node so the user cannot delete it.
- cmds.lockNode(shape, lock=True)
-
  nodes = [transform, shape]
  self[:] = nodes
 
@@ -70,15 +70,34 @@ def update(self, container, representation):
  shapes = cmds.ls(members, type="mvUsdCompoundShape")
  assert shapes, "Cannot find mvUsdCompoundShape in container"
 
- path = get_representation_path(representation)
+ project_name = representation["context"]["project"]["name"]
+ prev_representation_id = cmds.getAttr("{}.representation".format(node))
+ prev_representation = get_representation_by_id(project_name,
+ prev_representation_id)
+ prev_path = os.path.normpath(prev_representation["data"]["path"])
 
+ # Make sure we can load the plugin
+ cmds.loadPlugin("MultiverseForMaya", quiet=True)
  import multiverse
+
  for shape in shapes:
- multiverse.SetUsdCompoundAssetPaths(shape, [path])
+
+ asset_paths = multiverse.GetUsdCompoundAssetPaths(shape)
+ asset_paths = [os.path.normpath(p) for p in asset_paths]
+
+ assert asset_paths.count(prev_path) == 1, \
+ "Couldn't find matching path (or too many)"
+ prev_path_idx = asset_paths.index(prev_path)
+
+ path = get_representation_path(representation)
+ asset_paths[prev_path_idx] = path
+
+ multiverse.SetUsdCompoundAssetPaths(shape, asset_paths)
 
  cmds.setAttr("{}.representation".format(node),
  str(representation["_id"]),
  type="string")
+ mel.eval('refreshEditorTemplates;')
 
  def switch(self, container, representation):
  self.update(container, representation)