Merge branch 'release/2.14.0' into feature/698-after-effects-publish-to-deadline

.github_changelog_generator

@@ -1,7 +1,8 @@
 pr-wo-labels=False
 exclude-labels=duplicate,question,invalid,wontfix,weekly-digest
 author=False
-unreleased=False
+unreleased=True
 since-tag=2.11.0
 release-branch=master
 enhancement-label=**Enhancements:**
+issues=False

CHANGELOG.md

@@ -1,5 +1,69 @@
 # Changelog
 
+## [2.13.6](https://github.com/pypeclub/pype/tree/2.13.6) (2020-11-15)
+
+[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.5...2.13.6)
+
+**Fixed bugs:**
+
+- Maya workfile version wasn't syncing with renders properly [\#711](https://github.com/pypeclub/pype/pull/711)
+- Maya: Fix for publishing multiple cameras with review from the same scene [\#710](https://github.com/pypeclub/pype/pull/710)
+
+## [2.13.5](https://github.com/pypeclub/pype/tree/2.13.5) (2020-11-12)
+
+[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.4...2.13.5)
+
+**Enhancements:**
+
+- 3.0 lib refactor [\#664](https://github.com/pypeclub/pype/issues/664)
+
+**Fixed bugs:**
+
+- Wrong thumbnail file was picked when publishing sequence in standalone publisher [\#703](https://github.com/pypeclub/pype/pull/703)
+- Fix: Burnin data pass and FFmpeg tool check [\#701](https://github.com/pypeclub/pype/pull/701)
+
+## [2.13.4](https://github.com/pypeclub/pype/tree/2.13.4) (2020-11-09)
+
+[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.3...2.13.4)
+
+**Enhancements:**
+
+- AfterEffects integration with Websocket [\#663](https://github.com/pypeclub/pype/issues/663)
+
+**Fixed bugs:**
+
+- Photoshop uhiding hidden layers [\#688](https://github.com/pypeclub/pype/issues/688)
+- \#688 - Fix publishing hidden layers [\#692](https://github.com/pypeclub/pype/pull/692)
+
+**Closed issues:**
+
+- Nuke Favorite directories "shot dir" "project dir" - not working [\#684](https://github.com/pypeclub/pype/issues/684)
+
+**Merged pull requests:**
+
+- Nuke Favorite directories "shot dir" "project dir" - not working \#684 [\#685](https://github.com/pypeclub/pype/pull/685)
+
+## [2.13.3](https://github.com/pypeclub/pype/tree/2.13.3) (2020-11-03)
+
+[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.2...2.13.3)
+
+**Enhancements:**
+
+- TV paint base integration [\#612](https://github.com/pypeclub/pype/issues/612)
+
+**Fixed bugs:**
+
+- Fix ffmpeg executable path with spaces [\#680](https://github.com/pypeclub/pype/pull/680)
+- Hotfix: Added default version number [\#679](https://github.com/pypeclub/pype/pull/679)
+
+## [2.13.2](https://github.com/pypeclub/pype/tree/2.13.2) (2020-10-28)
+
+[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.1...2.13.2)
+
+**Fixed bugs:**
+
+- Nuke: wrong conditions when fixing legacy write nodes [\#665](https://github.com/pypeclub/pype/pull/665)
+
 ## [2.13.1](https://github.com/pypeclub/pype/tree/2.13.1) (2020-10-23)
 
 [Full Changelog](https://github.com/pypeclub/pype/compare/2.13.0...2.13.1)
@@ -12,6 +76,7 @@
 
 - Layer name is not propagating to metadata in Photoshop [\#654](https://github.com/pypeclub/pype/issues/654)
 - Loader in Photoshop fails with "can't set attribute" [\#650](https://github.com/pypeclub/pype/issues/650)
+- Nuke Load mp4 wrong frame range [\#661](https://github.com/pypeclub/pype/issues/661)
 - Hiero: Review video file adding one frame to the end [\#659](https://github.com/pypeclub/pype/issues/659)
 
 ## [2.13.0](https://github.com/pypeclub/pype/tree/2.13.0) (2020-10-18)
@@ -60,7 +125,6 @@
 
 **Merged pull requests:**
 
-- Audio file existence check [\#614](https://github.com/pypeclub/pype/pull/614)
 - Avalon module without Qt [\#581](https://github.com/pypeclub/pype/pull/581)
 - Ftrack module without Qt [\#577](https://github.com/pypeclub/pype/pull/577)
 
@@ -135,6 +199,7 @@
 
 **Merged pull requests:**
 
+- Audio file existence check [\#614](https://github.com/pypeclub/pype/pull/614)
 - NKS small fixes [\#587](https://github.com/pypeclub/pype/pull/587)
 - Standalone publisher editorial plugins interfering [\#580](https://github.com/pypeclub/pype/pull/580)
 
@@ -185,7 +250,6 @@
 **Fixed bugs:**
 
 - Maya: Fix tile order for Draft Tile Assembler [\#511](https://github.com/pypeclub/pype/pull/511)
-- NukeStudio: Fix comment tag collection and integration. [\#508](https://github.com/pypeclub/pype/pull/508)
 - Remove extra dash [\#501](https://github.com/pypeclub/pype/pull/501)
 - Fix: strip dot from repre names in single frame renders [\#498](https://github.com/pypeclub/pype/pull/498)
 - Better handling of destination during integrating [\#485](https://github.com/pypeclub/pype/pull/485)

pype/plugins/global/publish/integrate_new.py

@@ -90,7 +90,8 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                 "harmony.template",
                 "harmony.palette",
                 "editorial",
-                "background"
+                "background",
+                "camerarig"
                 ]
     exclude_families = ["clip"]
     db_representation_context_keys = [

pype/plugins/maya/create/create_camera.py

@@ -5,7 +5,7 @@ from pype.hosts.maya import lib
 class CreateCamera(avalon.maya.Creator):
     """Single baked camera"""
 
-    name = "cameraDefault"
+    name = "cameraMain"
     label = "Camera"
     family = "camera"
     icon = "video-camera"
@@ -22,3 +22,13 @@ class CreateCamera(avalon.maya.Creator):
         # Bake to world space by default, when this is False it will also
         # include the parent hierarchy in the baked results
         self.data['bakeToWorldSpace'] = True
+
+
+class CreateCameraRig(avalon.maya.Creator):
+    """Complex hierarchy with camera."""
+
+    name = "camerarigMain"
+    label = "Camera Rig"
+    family = "camerarig"
+    icon = "video-camera"
+    defaults = ['Main']

pype/plugins/maya/load/load_reference.py

@@ -15,7 +15,8 @@ class ReferenceLoader(pype.hosts.maya.plugin.ReferenceLoader):
                 "setdress",
                 "layout",
                 "camera",
-                "rig"]
+                "rig",
+                "camerarig"]
     representations = ["ma", "abc", "fbx", "mb"]
     tool_names = ["loader"]
 

pype/plugins/maya/load/load_vrayproxy.py

@@ -39,20 +39,20 @@ class VRayProxyLoader(api.Loader):
         with lib.maintained_selection():
             cmds.namespace(addNamespace=namespace)
             with namespaced(namespace, new=False):
-                nodes = self.create_vray_proxy(name,
+                nodes, group_node = self.create_vray_proxy(name,
                                                filename=self.fname)
 
         self[:] = nodes
         if not nodes:
             return
 
+        # colour the group node
         presets = config.get_presets(project=os.environ['AVALON_PROJECT'])
         colors = presets['plugins']['maya']['load']['colors']
-
         c = colors.get(family)
         if c is not None:
-            cmds.setAttr("{0}_{1}.useOutlinerColor".format(name, "GRP"), 1)
-            cmds.setAttr("{0}_{1}.outlinerColor".format(name, "GRP"),
+            cmds.setAttr("{0}.useOutlinerColor".format(group_node), 1)
+            cmds.setAttr("{0}.outlinerColor".format(group_node),
                          c[0], c[1], c[2])
 
         return containerise(
@@ -158,4 +158,4 @@ class VRayProxyLoader(api.Loader):
         cmds.refresh()
         cmds.setAttr("{}.geomType".format(vray_mesh), 2)
 
-        return nodes
+        return nodes, group_node

pype/plugins/maya/publish/extract_maya_scene_raw.py

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

pype/plugins/standalonepublisher/publish/collect_instance_data.py

@@ -22,7 +22,7 @@ class CollectInstanceData(pyblish.api.InstancePlugin):
     hosts = ["standalonepublisher"]
 
     def process(self, instance):
-        fps = instance.data["assetEntity"]["data"]["fps"]
+        fps = instance.context.data["fps"]
         instance.data.update({
             "fps": fps
         })

pype/tools/launcher/widgets.py

@@ -49,6 +49,14 @@ class ProjectBar(QtWidgets.QWidget):
 
     def set_project(self, project_name):
         index = self.project_combobox.findText(project_name)
+        if index < 0:
+            # Try refresh combobox model
+            self.project_combobox.blockSignals(True)
+            self.model.refresh()
+            self.project_combobox.blockSignals(False)
+
+            index = self.project_combobox.findText(project_name)
+
         if index >= 0:
             self.project_combobox.setCurrentIndex(index)
 

pype/tools/launcher/window.py

@@ -207,7 +207,7 @@ class AssetsPanel(QtWidgets.QWidget):
         self.assets_widget.refresh()
 
         # Force asset change callback to ensure tasks are correctly reset
-        tools_lib.schedule(self.on_asset_changed, 0.05, channel="assets")
+        self.assets_widget.refreshed.connect(self.on_asset_changed)
 
     def on_asset_changed(self):
         """Callback on asset selection changed
@@ -375,7 +375,6 @@ class LauncherWindow(QtWidgets.QDialog):
     def on_project_clicked(self, project_name):
         self.dbcon.Session["AVALON_PROJECT"] = project_name
         # Refresh projects
-        self.asset_panel.project_bar.refresh()
         self.asset_panel.set_project(project_name)
         self.set_page(1)
         self.refresh_actions()

pype/version.py

@@ -1 +1 @@
-__version__ = "2.13.6"
+__version__ = "2.14.0-rc"