Merge branch 'develop' into feature/houdini-cb-update

.gitmodules

@@ -4,9 +4,9 @@
 [submodule "repos/avalon-unreal-integration"]
  path = repos/avalon-unreal-integration
  url = https://github.com/pypeclub/avalon-unreal-integration.git
-[submodule "openpype/modules/ftrack/python2_vendor/ftrack-python-api"]
- path = openpype/modules/ftrack/python2_vendor/ftrack-python-api
+[submodule "openpype/modules/default_modules/ftrack/python2_vendor/arrow"]
+ path = openpype/modules/default_modules/ftrack/python2_vendor/arrow
+ url = git@github.com:arrow-py/arrow.git
+[submodule "openpype/modules/default_modules/ftrack/python2_vendor/ftrack-python-api"]
+ path = openpype/modules/default_modules/ftrack/python2_vendor/ftrack-python-api
  url = https://bitbucket.org/ftrack/ftrack-python-api.git
-[submodule "openpype/modules/ftrack/python2_vendor/arrow"]
- path = openpype/modules/ftrack/python2_vendor/arrow
- url = https://github.com/arrow-py/arrow.git

CHANGELOG.md

@@ -1,91 +1,91 @@
 # Changelog
 
-## [3.3.0-nightly.10](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.4.0-nightly.2](https://github.com/pypeclub/OpenPype/tree/HEAD)
 
-[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.2.0...HEAD)
+[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.3.1...HEAD)
 
-**🚀 Enhancements**
+**Merged pull requests:**
+
+- Maya: Add Xgen family support [\#1947](https://github.com/pypeclub/OpenPype/pull/1947)
+- Add face sets to exported alembics [\#1942](https://github.com/pypeclub/OpenPype/pull/1942)
+- Environments: Tool environments in alphabetical order [\#1910](https://github.com/pypeclub/OpenPype/pull/1910)
+- Dynamic modules [\#1872](https://github.com/pypeclub/OpenPype/pull/1872)
+
+## [3.3.1](https://github.com/pypeclub/OpenPype/tree/3.3.1) (2021-08-20)
+
+[Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.3.1-nightly.1...3.3.1)
+
+**Merged pull requests:**
+
+- TVPaint: Fixed rendered frame indexes [\#1946](https://github.com/pypeclub/OpenPype/pull/1946)
+- Maya: Menu actions fix [\#1945](https://github.com/pypeclub/OpenPype/pull/1945)
+- standalone: editorial shared object problem [\#1941](https://github.com/pypeclub/OpenPype/pull/1941)
+- Bugfix nuke deadline app name [\#1928](https://github.com/pypeclub/OpenPype/pull/1928)
+
+## [3.3.0](https://github.com/pypeclub/OpenPype/tree/3.3.0) (2021-08-17)
 
+[Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.3.0-nightly.11...3.3.0)
+
+**Merged pull requests:**
+
+- Python console interpreter [\#1940](https://github.com/pypeclub/OpenPype/pull/1940)
+- Fix - make AE workfile publish to Ftrack configurable [\#1937](https://github.com/pypeclub/OpenPype/pull/1937)
+- Fix - ftrack family was added incorrectly in some cases [\#1935](https://github.com/pypeclub/OpenPype/pull/1935)
+- Settings UI: Breadcrumbs in settings [\#1932](https://github.com/pypeclub/OpenPype/pull/1932)
+- Fix - Deadline publish on Linux started Tray instead of headless publishing [\#1930](https://github.com/pypeclub/OpenPype/pull/1930)
+- Maya: Validate Model Name - repair accident deletion in settings defaults [\#1929](https://github.com/pypeclub/OpenPype/pull/1929)
 - Global: Updated logos and Default settings [\#1927](https://github.com/pypeclub/OpenPype/pull/1927)
+- Nuke: submit to farm failed due `ftrack` family remove [\#1926](https://github.com/pypeclub/OpenPype/pull/1926)
 - Check for missing ✨ Python when using `pyenv` [\#1925](https://github.com/pypeclub/OpenPype/pull/1925)
 - Maya: Scene patching 🩹on submission to Deadline [\#1923](https://github.com/pypeclub/OpenPype/pull/1923)
+- Fix - validate takes repre\["files"\] as list all the time [\#1922](https://github.com/pypeclub/OpenPype/pull/1922)
 - Settings: Default values for enum [\#1920](https://github.com/pypeclub/OpenPype/pull/1920)
 - Settings UI: Modifiable dict view enhance [\#1919](https://github.com/pypeclub/OpenPype/pull/1919)
+- standalone: validator asset parents [\#1917](https://github.com/pypeclub/OpenPype/pull/1917)
+- Nuke: update video file crassing [\#1916](https://github.com/pypeclub/OpenPype/pull/1916)
+- Fix - texture validators for workfiles triggers only for textures workfiles [\#1914](https://github.com/pypeclub/OpenPype/pull/1914)
 - submodules: avalon-core update [\#1911](https://github.com/pypeclub/OpenPype/pull/1911)
+- Settings UI: List order works as expected [\#1906](https://github.com/pypeclub/OpenPype/pull/1906)
+- Add support for multiple Deadline ☠️➖ servers [\#1905](https://github.com/pypeclub/OpenPype/pull/1905)
+- Hiero: loaded clip was not set colorspace from version data [\#1904](https://github.com/pypeclub/OpenPype/pull/1904)
+- Pyblish UI: Fix collecting stage processing [\#1903](https://github.com/pypeclub/OpenPype/pull/1903)
+- Burnins: Use input's bitrate in h624 [\#1902](https://github.com/pypeclub/OpenPype/pull/1902)
 - Feature AE local render [\#1901](https://github.com/pypeclub/OpenPype/pull/1901)
 - Ftrack: Where I run action enhancement [\#1900](https://github.com/pypeclub/OpenPype/pull/1900)
 - Ftrack: Private project server actions [\#1899](https://github.com/pypeclub/OpenPype/pull/1899)
 - Support nested studio plugins paths. [\#1898](https://github.com/pypeclub/OpenPype/pull/1898)
+- Bug: fixed python detection [\#1893](https://github.com/pypeclub/OpenPype/pull/1893)
 - Settings: global validators with options [\#1892](https://github.com/pypeclub/OpenPype/pull/1892)
 - Settings: Conditional dict enum positioning [\#1891](https://github.com/pypeclub/OpenPype/pull/1891)
+- global: integrate name missing default template [\#1890](https://github.com/pypeclub/OpenPype/pull/1890)
+- publisher: editorial plugins fixes [\#1889](https://github.com/pypeclub/OpenPype/pull/1889)
 - Expose stop timer through rest api. [\#1886](https://github.com/pypeclub/OpenPype/pull/1886)
 - TVPaint: Increment workfile [\#1885](https://github.com/pypeclub/OpenPype/pull/1885)
 - Allow Multiple Notes to run on tasks. [\#1882](https://github.com/pypeclub/OpenPype/pull/1882)
+- Normalize path returned from Workfiles. [\#1880](https://github.com/pypeclub/OpenPype/pull/1880)
 - Prepare for pyside2 [\#1869](https://github.com/pypeclub/OpenPype/pull/1869)
 - Filter hosts in settings host-enum [\#1868](https://github.com/pypeclub/OpenPype/pull/1868)
 - Local actions with process identifier [\#1867](https://github.com/pypeclub/OpenPype/pull/1867)
 - Workfile tool start at host launch support [\#1865](https://github.com/pypeclub/OpenPype/pull/1865)
-- Anatomy schema validation [\#1864](https://github.com/pypeclub/OpenPype/pull/1864)
-- Ftrack prepare project structure [\#1861](https://github.com/pypeclub/OpenPype/pull/1861)
+- Maya: add support for `RedshiftNormalMap` node, fix `tx` linear space 🚀 [\#1863](https://github.com/pypeclub/OpenPype/pull/1863)
+- Workfiles tool event arguments fix [\#1862](https://github.com/pypeclub/OpenPype/pull/1862)
 - Maya: support for configurable `dirmap` 🗺️ [\#1859](https://github.com/pypeclub/OpenPype/pull/1859)
-- Independent general environments [\#1853](https://github.com/pypeclub/OpenPype/pull/1853)
-- TVPaint Start Frame [\#1844](https://github.com/pypeclub/OpenPype/pull/1844)
-- Standalone Publish of textures family [\#1834](https://github.com/pypeclub/OpenPype/pull/1834)
+- Maya: don't add reference members as connections to the container set 📦 [\#1855](https://github.com/pypeclub/OpenPype/pull/1855)
 - Settings list can use template or schema as object type [\#1815](https://github.com/pypeclub/OpenPype/pull/1815)
-
-**🐛 Bug fixes**
-
-- Fix - ftrack family was added incorrectly in some cases [\#1935](https://github.com/pypeclub/OpenPype/pull/1935)
-- Fix - Deadline publish on Linux started Tray instead of headless publishing [\#1930](https://github.com/pypeclub/OpenPype/pull/1930)
-- Maya: Validate Model Name - repair accident deletion in settings defaults [\#1929](https://github.com/pypeclub/OpenPype/pull/1929)
-- Nuke: submit to farm failed due `ftrack` family remove [\#1926](https://github.com/pypeclub/OpenPype/pull/1926)
-- Fix - validate takes repre\["files"\] as list all the time [\#1922](https://github.com/pypeclub/OpenPype/pull/1922)
-- standalone: validator asset parents [\#1917](https://github.com/pypeclub/OpenPype/pull/1917)
-- Fix - texture validators for workfiles triggers only for textures workfiles [\#1914](https://github.com/pypeclub/OpenPype/pull/1914)
-- Settings UI: List order works as expected [\#1906](https://github.com/pypeclub/OpenPype/pull/1906)
-- Hiero: loaded clip was not set colorspace from version data [\#1904](https://github.com/pypeclub/OpenPype/pull/1904)
-- Pyblish UI: Fix collecting stage processing [\#1903](https://github.com/pypeclub/OpenPype/pull/1903)
-- Burnins: Use input's bitrate in h624 [\#1902](https://github.com/pypeclub/OpenPype/pull/1902)
-- Bug: fixed python detection [\#1893](https://github.com/pypeclub/OpenPype/pull/1893)
-- global: integrate name missing default template [\#1890](https://github.com/pypeclub/OpenPype/pull/1890)
-- publisher: editorial plugins fixes [\#1889](https://github.com/pypeclub/OpenPype/pull/1889)
-- Normalize path returned from Workfiles. [\#1880](https://github.com/pypeclub/OpenPype/pull/1880)
-- Workfiles tool event arguments fix [\#1862](https://github.com/pypeclub/OpenPype/pull/1862)
-- imageio: fix grouping [\#1856](https://github.com/pypeclub/OpenPype/pull/1856)
-- Ftrack type error fix in sync to avalon event handler [\#1845](https://github.com/pypeclub/OpenPype/pull/1845)
+- Maya: expected files -\> render products ⚙️ overhaul [\#1812](https://github.com/pypeclub/OpenPype/pull/1812)
 - Settings error dialog on show [\#1798](https://github.com/pypeclub/OpenPype/pull/1798)
 
-**Merged pull requests:**
-
-- Fix - make AE workfile publish to Ftrack configurable [\#1937](https://github.com/pypeclub/OpenPype/pull/1937)
-- Settings UI: Breadcrumbs in settings [\#1932](https://github.com/pypeclub/OpenPype/pull/1932)
-- Maya: add support for `RedshiftNormalMap` node, fix `tx` linear space 🚀 [\#1863](https://github.com/pypeclub/OpenPype/pull/1863)
-
 ## [3.2.0](https://github.com/pypeclub/OpenPype/tree/3.2.0) (2021-07-13)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.2.0-nightly.7...3.2.0)
 
-**🚀 Enhancements**
-
-- Standalone publisher last project [\#1799](https://github.com/pypeclub/OpenPype/pull/1799)
-- Ftrack Multiple notes as server action [\#1795](https://github.com/pypeclub/OpenPype/pull/1795)
-- Settings conditional dict [\#1777](https://github.com/pypeclub/OpenPype/pull/1777)
-- Settings application use python 2 only where needed [\#1776](https://github.com/pypeclub/OpenPype/pull/1776)
-
-**🐛 Bug fixes**
-
-- nuke: fixing wrong name of family folder when `used existing frames` [\#1803](https://github.com/pypeclub/OpenPype/pull/1803)
-- Collect ftrack family bugs [\#1801](https://github.com/pypeclub/OpenPype/pull/1801)
-- Invitee email can be None which break the Ftrack commit. [\#1788](https://github.com/pypeclub/OpenPype/pull/1788)
-- Fix: staging and `--use-version` option [\#1786](https://github.com/pypeclub/OpenPype/pull/1786)
-- Otio unrelated error on import [\#1782](https://github.com/pypeclub/OpenPype/pull/1782)
-- FFprobe streams order [\#1775](https://github.com/pypeclub/OpenPype/pull/1775)
-
 **Merged pull requests:**
 
-- PS, AE - send actual context when another webserver is running [\#1811](https://github.com/pypeclub/OpenPype/pull/1811)
 - Build: don't add Poetry to `PATH` [\#1808](https://github.com/pypeclub/OpenPype/pull/1808)
-- Bump prismjs from 1.23.0 to 1.24.0 in /website [\#1773](https://github.com/pypeclub/OpenPype/pull/1773)
+- Nuke: ftrack family plugin settings preset [\#1805](https://github.com/pypeclub/OpenPype/pull/1805)
+- nuke: fixing wrong name of family folder when `used existing frames` [\#1803](https://github.com/pypeclub/OpenPype/pull/1803)
+- Collect ftrack family bugs [\#1801](https://github.com/pypeclub/OpenPype/pull/1801)
+- Standalone publisher last project [\#1799](https://github.com/pypeclub/OpenPype/pull/1799)
 
 ## [2.18.4](https://github.com/pypeclub/OpenPype/tree/2.18.4) (2021-06-24)
 

openpype/__init__.py

@@ -68,6 +68,10 @@ def patched_discover(superclass):
 def install():
  """Install Pype to Avalon."""
  from pyblish.lib import MessageHandler
+ from openpype.modules import load_modules
+
+ # Make sure modules are loaded
+ load_modules()
 
  def modified_emit(obj, record):
  """Method replacing `emit` in Pyblish's MessageHandler."""

openpype/hosts/maya/api/menu.py

@@ -16,12 +16,9 @@
 
 def _get_menu(menu_name=None):
  """Return the menu instance if it currently exists in Maya"""
-
- project_settings = get_project_settings(os.getenv("AVALON_PROJECT"))
- _menu = project_settings["maya"]["scriptsmenu"]["name"]
-
  if menu_name is None:
- menu_name = _menu
+ menu_name = pipeline._menu
+
  widgets = dict((
  w.objectName(), w) for w in QtWidgets.QApplication.allWidgets())
  menu = widgets.get(menu_name)
@@ -58,11 +55,64 @@ def launch_workfiles_app(*_args, **_kwargs):
  parent=pipeline._parent
  )
 
+ # Find the pipeline menu
+ top_menu = _get_menu()
+
+ # Try to find workfile tool action in the menu
+ workfile_action = None
+ for action in top_menu.actions():
+ if action.text() == "Work Files":
+ workfile_action = action
+ break
+
+ # Add at the top of menu if "Work Files" action was not found
+ after_action = ""
+ if workfile_action:
+ # Use action's object name for `insertAfter` argument
+ after_action = workfile_action.objectName()
+
+ # Insert action to menu
+ cmds.menuItem(
+ "Work Files",
+ parent=pipeline._menu,
+ command=launch_workfiles_app,
+ insertAfter=after_action
+ )
+
+ # Remove replaced action
+ if workfile_action:
+ top_menu.removeAction(workfile_action)
+
+ def remove_project_manager():
+ top_menu = _get_menu()
+
+ # Try to find "System" menu action in the menu
+ system_menu = None
+ for action in top_menu.actions():
+ if action.text() == "System":
+ system_menu = action
+ break
+
+ if system_menu is None:
+ return
+
+ # Try to find "Project manager" action in "System" menu
+ project_manager_action = None
+ for action in system_menu.menu().children():
+ if hasattr(action, "text") and action.text() == "Project Manager":
+ project_manager_action = action
+ break
+
+ # Remove "Project manager" action if was found
+ if project_manager_action is not None:
+ system_menu.menu().removeAction(project_manager_action)
+
  log.info("Attempting to install scripts menu ...")
 
  add_build_workfiles_item()
  add_look_assigner_item()
  modify_workfiles()
+ remove_project_manager()
 
  try:
  import scriptsmenu.launchformaya as launchformaya
@@ -110,7 +160,6 @@ def install():
  log.info("Skipping openpype.menu initialization in batch mode..")
  return
 
- uninstall()
  # Allow time for uninstallation to finish.
  cmds.evalDeferred(deferred)
 

openpype/hosts/maya/api/plugin.py

@@ -99,14 +99,24 @@ def load(
  nodes = self[:]
  if not nodes:
  return
-
- loaded_containers.append(containerise(
- name=name,
- namespace=namespace,
- nodes=nodes,
- context=context,
- loader=self.__class__.__name__
- ))
+ # FIXME: there is probably better way to do this for looks.
+ if "look" in self.families:
+ loaded_containers.append(containerise(
+ name=name,
+ namespace=namespace,
+ nodes=nodes,
+ context=context,
+ loader=self.__class__.__name__
+ ))
+ else:
+ ref_node = self._get_reference_node(nodes)
+ loaded_containers.append(containerise(
+ name=name,
+ namespace=namespace,
+ nodes=[ref_node],
+ context=context,
+ loader=self.__class__.__name__
+ ))
 
  c += 1
  namespace = None
@@ -235,9 +245,6 @@ def update(self, container, representation):
  self.log.info("Setting %s.verticesOnlySet to False", node)
  cmds.setAttr("{}.verticesOnlySet".format(node), False)
 
- # Add new nodes of the reference to the container
- cmds.sets(content, forceElement=node)
-
  # Remove any placeHolderList attribute entries from the set that
  # are remaining from nodes being removed from the referenced file.
  members = cmds.sets(node, query=True)

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

@@ -24,6 +24,7 @@ def __init__(self, *args, **kwargs):
 
  # Write vertex colors with the geometry.
  self.data["writeColorSets"] = False
+ self.data["writeFaceSets"] = False
 
  # Include only renderable visible shapes.
  # Skips locators and empty transforms

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

@@ -15,6 +15,7 @@ def __init__(self, *args, **kwargs):
 
  # Vertex colors with the geometry
  self.data["writeColorSets"] = False
+ self.data["writeFaceSets"] = False
 
  # Include attributes by attribute name or prefix
  self.data["attr"] = ""

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

@@ -20,6 +20,7 @@ def __init__(self, *args, **kwargs):
  self.data.update(lib.collect_animation_data())
 
  self.data["writeColorSets"] = False # Vertex colors with the geometry.
+ self.data["writeFaceSets"] = False # Vertex colors with the geometry.
  self.data["renderableOnly"] = False # Only renderable visible shapes
  self.data["visibleOnly"] = False # only nodes that are visible
  self.data["includeParentHierarchy"] = False # Include parent groups

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

@@ -0,0 +1,11 @@
+from openpype.hosts.maya.api import plugin
+
+
+class CreateXgen(plugin.Creator):
+ """Xgen interactive export"""
+
+ name = "xgen"
+ label = "Xgen Interactive"
+ family = "xgen"
+ icon = "pagelines"
+ defaults = ['Main']

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

@@ -17,7 +17,8 @@ class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
  "layout",
  "camera",
  "rig",
- "camerarig"]
+ "camerarig",
+ "xgen"]
  representations = ["ma", "abc", "fbx", "mb"]
 
  label = "Reference"

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

@@ -57,7 +57,8 @@ def process(self, instance):
  "uvWrite": True,
  "selection": True,
  "worldSpace": instance.data.get("worldSpace", True),
- "writeColorSets": instance.data.get("writeColorSets", False)
+ "writeColorSets": instance.data.get("writeColorSets", False),
+ "writeFaceSets": instance.data.get("writeFaceSets", False)
  }
 
  if not instance.data.get("includeParentHierarchy", True):

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

@@ -19,7 +19,8 @@ class ExtractMayaSceneRaw(openpype.api.Extractor):
  families = ["mayaAscii",
  "setdress",
  "layout",
- "camerarig"]
+ "camerarig",
+ "xgen"]
  scene_type = "ma"
 
  def process(self, instance):

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

@@ -28,6 +28,7 @@ class ExtractModel(openpype.api.Extractor):
  hosts = ["maya"]
  families = ["model"]
  scene_type = "ma"
+ optional = True
 
  def process(self, instance):
  """Plugin entry point."""

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

@@ -38,6 +38,7 @@ def process(self, instance):
 
  # Get extra export arguments
  writeColorSets = instance.data.get("writeColorSets", False)
+ writeFaceSets = instance.data.get("writeFaceSets", False)
 
  self.log.info("Extracting pointcache..")
  dirname = self.staging_dir(instance)
@@ -53,6 +54,7 @@ def process(self, instance):
  "writeVisibility": True,
  "writeCreases": True,
  "writeColorSets": writeColorSets,
+ "writeFaceSets": writeFaceSets,
  "uvWrite": True,
  "selection": True,
  "worldSpace": instance.data.get("worldSpace", True)