Merge branch 'develop' of https://github.com/pypeclub/OpenPype into d…

…eadlineissues

.github/workflows/documentation.yml

@@ -20,7 +20,8 @@ jobs:
  - uses: actions/checkout@v1
  - uses: actions/setup-node@v1
  with:
- node-version: '12.x'
+ node-version: 14.x
+ cache: yarn
  - name: Test Build
  run: |
  cd website
@@ -41,8 +42,8 @@ jobs:
 
  - uses: actions/setup-node@v1
  with:
- node-version: '12.x'
-
+ node-version: 14.x
+ cache: yarn
  - name: 🔨 Build
  run: |
  cd website

CHANGELOG.md

@@ -1,29 +1,46 @@
 # Changelog
 
-## [3.9.0-nightly.1](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.9.0-nightly.2](https://github.com/pypeclub/OpenPype/tree/HEAD)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.8.2...HEAD)
 
+**Deprecated:**
+
+- Loader: Remove default family states for hosts from code [\#2706](https://github.com/pypeclub/OpenPype/pull/2706)
+
 ### 📖 Documentation
 
 - documentation: add example to `repack-version` command [\#2669](https://github.com/pypeclub/OpenPype/pull/2669)
 - Update docusaurus [\#2639](https://github.com/pypeclub/OpenPype/pull/2639)
 - Documentation: Fixed relative links [\#2621](https://github.com/pypeclub/OpenPype/pull/2621)
 
+**🆕 New features**
+
+- General: Store settings by OpenPype version [\#2570](https://github.com/pypeclub/OpenPype/pull/2570)
+
 **🚀 Enhancements**
 
+- Project Manager: Disable add task, add asset and save button when not in a project [\#2727](https://github.com/pypeclub/OpenPype/pull/2727)
+- Nuke: prerender with review knob [\#2691](https://github.com/pypeclub/OpenPype/pull/2691)
 - Maya configurable unit validator [\#2680](https://github.com/pypeclub/OpenPype/pull/2680)
 - Ftrack: Sync description to assets [\#2670](https://github.com/pypeclub/OpenPype/pull/2670)
 - Houdini: Moved to OpenPype [\#2658](https://github.com/pypeclub/OpenPype/pull/2658)
 - Maya: Move implementation to OpenPype [\#2649](https://github.com/pypeclub/OpenPype/pull/2649)
 - General: FFmpeg conversion also check attribute string length [\#2635](https://github.com/pypeclub/OpenPype/pull/2635)
+- Global: adding studio name/code to anatomy template formatting data [\#2630](https://github.com/pypeclub/OpenPype/pull/2630)
 - Houdini: Load Arnold .ass procedurals into Houdini [\#2606](https://github.com/pypeclub/OpenPype/pull/2606)
 - Houdini: Implement Arnold .ass standin extraction from Houdini \(also support .ass.gz\) [\#2603](https://github.com/pypeclub/OpenPype/pull/2603)
 - New Publisher: New features and preparations for new standalone publisher [\#2556](https://github.com/pypeclub/OpenPype/pull/2556)
 
 **🐛 Bug fixes**
 
+- TVPaint: Set objectName with members [\#2725](https://github.com/pypeclub/OpenPype/pull/2725)
+- General: Don't use 'objectName' from loaded references [\#2715](https://github.com/pypeclub/OpenPype/pull/2715)
+- Settings: Studio Project anatomy is queried using right keys [\#2711](https://github.com/pypeclub/OpenPype/pull/2711)
+- Local Settings: Additional applications don't break UI [\#2710](https://github.com/pypeclub/OpenPype/pull/2710)
+- Houdini: Fix refactor of Houdini host move for CreateArnoldAss [\#2704](https://github.com/pypeclub/OpenPype/pull/2704)
 - LookAssigner: Fix imports after moving code to OpenPype repository [\#2701](https://github.com/pypeclub/OpenPype/pull/2701)
+- Multiple hosts: unify menu style across hosts [\#2693](https://github.com/pypeclub/OpenPype/pull/2693)
 - Maya Redshift fixes [\#2692](https://github.com/pypeclub/OpenPype/pull/2692)
 - Maya: fix fps validation popup [\#2685](https://github.com/pypeclub/OpenPype/pull/2685)
 - Houdini Explicitly collect correct frame name even in case of single frame render when `frameStart` is provided [\#2676](https://github.com/pypeclub/OpenPype/pull/2676)
@@ -34,6 +51,8 @@
 
 **Merged pull requests:**
 
+- General: Fix loading of unused chars in xml format [\#2729](https://github.com/pypeclub/OpenPype/pull/2729)
+- TVPaint: Plugin build without dependencies [\#2705](https://github.com/pypeclub/OpenPype/pull/2705)
 - Webpublisher: Photoshop create a beauty png [\#2689](https://github.com/pypeclub/OpenPype/pull/2689)
 - Ftrack: Hierarchical attributes are queried properly [\#2682](https://github.com/pypeclub/OpenPype/pull/2682)
 - Fix python install in docker for centos7 [\#2664](https://github.com/pypeclub/OpenPype/pull/2664)
@@ -42,7 +61,6 @@
 - General: Show applications without integration in project [\#2656](https://github.com/pypeclub/OpenPype/pull/2656)
 - Maya: cleanup duplicate rendersetup code [\#2642](https://github.com/pypeclub/OpenPype/pull/2642)
 - Deadline: Be able to pass Mongo url to job [\#2616](https://github.com/pypeclub/OpenPype/pull/2616)
-- Fix - safer pulling of task name for webpublishing from PS [\#2613](https://github.com/pypeclub/OpenPype/pull/2613)
 
 ## [3.8.2](https://github.com/pypeclub/OpenPype/tree/3.8.2) (2022-02-07)
 
@@ -55,7 +73,6 @@
 **🚀 Enhancements**
 
 - TVPaint: Image loaders also work on review family [\#2638](https://github.com/pypeclub/OpenPype/pull/2638)
-- Global: adding studio name/code to anatomy template formatting data [\#2630](https://github.com/pypeclub/OpenPype/pull/2630)
 - General: Project backup tools [\#2629](https://github.com/pypeclub/OpenPype/pull/2629)
 - nuke: adding clear button to write nodes [\#2627](https://github.com/pypeclub/OpenPype/pull/2627)
 - Ftrack: Family to Asset type mapping is in settings [\#2602](https://github.com/pypeclub/OpenPype/pull/2602)
@@ -70,6 +87,7 @@
 
 - Docker: enhance dockerfiles with metadata, fix pyenv initialization [\#2647](https://github.com/pypeclub/OpenPype/pull/2647)
 - WebPublisher: fix instance duplicates [\#2641](https://github.com/pypeclub/OpenPype/pull/2641)
+- Fix - safer pulling of task name for webpublishing from PS [\#2613](https://github.com/pypeclub/OpenPype/pull/2613)
 
 ## [3.8.1](https://github.com/pypeclub/OpenPype/tree/3.8.1) (2022-02-01)
 
@@ -78,7 +96,6 @@
 **🚀 Enhancements**
 
 - Webpublisher: Thumbnail extractor [\#2600](https://github.com/pypeclub/OpenPype/pull/2600)
-- Loader: Allow to toggle default family filters between "include" or "exclude" filtering [\#2541](https://github.com/pypeclub/OpenPype/pull/2541)
 
 **🐛 Bug fixes**
 
@@ -100,25 +117,11 @@
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.8.0-nightly.7...3.8.0)
 
-### 📖 Documentation
-
-- Variable in docs renamed to proper name [\#2546](https://github.com/pypeclub/OpenPype/pull/2546)
-
-**🆕 New features**
-
-- General: Store settings by OpenPype version [\#2570](https://github.com/pypeclub/OpenPype/pull/2570)
-- Flame: extracting segments with trans-coding [\#2547](https://github.com/pypeclub/OpenPype/pull/2547)
-- Maya : V-Ray Proxy - load all ABC files via proxy [\#2544](https://github.com/pypeclub/OpenPype/pull/2544)
-- Maya to Unreal: Extended static mesh workflow [\#2537](https://github.com/pypeclub/OpenPype/pull/2537)
-
 **🚀 Enhancements**
 
 - Webpublisher: Moved error at the beginning of the log [\#2559](https://github.com/pypeclub/OpenPype/pull/2559)
 - Ftrack: Use ApplicationManager to get DJV path [\#2558](https://github.com/pypeclub/OpenPype/pull/2558)
 - Webpublisher: Added endpoint to reprocess batch through UI [\#2555](https://github.com/pypeclub/OpenPype/pull/2555)
-- Settings: PathInput strip passed string [\#2550](https://github.com/pypeclub/OpenPype/pull/2550)
-- Global: Exctract Review anatomy fill data with output name [\#2548](https://github.com/pypeclub/OpenPype/pull/2548)
-- Cosmetics: Clean up some cosmetics / typos [\#2542](https://github.com/pypeclub/OpenPype/pull/2542)
 
 **🐛 Bug fixes**
 
@@ -127,15 +130,6 @@
 - Ftrack: Delete action revision [\#2563](https://github.com/pypeclub/OpenPype/pull/2563)
 - Webpublisher: ftrack shows incorrect user names [\#2560](https://github.com/pypeclub/OpenPype/pull/2560)
 - General: Do not validate version if build does not support it [\#2557](https://github.com/pypeclub/OpenPype/pull/2557)
-- Webpublisher: Fixed progress reporting [\#2553](https://github.com/pypeclub/OpenPype/pull/2553)
-- Fix Maya AssProxyLoader version switch [\#2551](https://github.com/pypeclub/OpenPype/pull/2551)
-- General: Fix install thread in igniter [\#2549](https://github.com/pypeclub/OpenPype/pull/2549)
-
-**Merged pull requests:**
-
-- AfterEffects: Move implementation to OpenPype [\#2543](https://github.com/pypeclub/OpenPype/pull/2543)
-- Maya: Remove Maya Look Assigner check on startup [\#2540](https://github.com/pypeclub/OpenPype/pull/2540)
-- build\(deps\): bump shelljs from 0.8.4 to 0.8.5 in /website [\#2538](https://github.com/pypeclub/OpenPype/pull/2538)
 
 ## [3.7.0](https://github.com/pypeclub/OpenPype/tree/3.7.0) (2022-01-04)
 

openpype/hosts/aftereffects/plugins/create/create_render.py

@@ -19,6 +19,7 @@ class CreateRender(openpype.api.Creator):
  name = "renderDefault"
  label = "Render on Farm"
  family = "render"
+ defaults = ["Main"]
 
  def process(self):
  stub = get_stub() # only after After Effects is up

openpype/hosts/blender/api/plugin.py

@@ -131,6 +131,8 @@ def deselect_all():
 
 class Creator(PypeCreatorMixin, avalon.api.Creator):
  """Base class for Creator plug-ins."""
+ defaults = ['Main']
+
  def process(self):
  collection = bpy.data.collections.new(name=self.data["subset"])
  bpy.context.scene.collection.children.link(collection)

openpype/hosts/flame/__init__.py

@@ -3,3 +3,20 @@
 HOST_DIR = os.path.dirname(
  os.path.abspath(__file__)
 )
+
+
+def add_implementation_envs(env, _app):
+ # Add requirements to DL_PYTHON_HOOK_PATH
+ pype_root = os.environ["OPENPYPE_REPOS_ROOT"]
+
+ env["DL_PYTHON_HOOK_PATH"] = os.path.join(
+ pype_root, "openpype", "hosts", "flame", "startup")
+ env.pop("QT_AUTO_SCREEN_SCALE_FACTOR", None)
+
+ # Set default values if are not already set via settings
+ defaults = {
+ "LOGLEVEL": "DEBUG"
+ }
+ for key, value in defaults.items():
+ if not env.get(key):
+ env[key] = value

openpype/hosts/flame/api/__init__.py

@@ -28,7 +28,8 @@
  get_reformated_filename,
  get_frame_from_filename,
  get_padding_from_filename,
- maintained_object_duplication
+ maintained_object_duplication,
+ get_clip_segment
 )
 from .utils import (
  setup,
@@ -52,7 +53,10 @@
 )
 from .plugin import (
  Creator,
- PublishableClip
+ PublishableClip,
+ ClipLoader,
+ OpenClipSolver
+
 )
 from .workio import (
  open_file,
@@ -96,6 +100,7 @@
  "get_frame_from_filename",
  "get_padding_from_filename",
  "maintained_object_duplication",
+ "get_clip_segment",
 
  # pipeline
  "install",
@@ -122,6 +127,8 @@
  # plugin
  "Creator",
  "PublishableClip",
+ "ClipLoader",
+ "OpenClipSolver",
 
  # workio
  "open_file",

openpype/hosts/flame/api/lib.py

@@ -692,3 +692,18 @@ def maintained_object_duplication(item):
  finally:
  # delete the item at the end
  flame.delete(duplicate)
+
+
+def get_clip_segment(flame_clip):
+ name = flame_clip.name.get_value()
+ version = flame_clip.versions[0]
+ track = version.tracks[0]
+ segments = track.segments
+
+ if len(segments) < 1:
+ raise ValueError("Clip `{}` has no segments!".format(name))
+
+ if len(segments) > 1:
+ raise ValueError("Clip `{}` has too many segments!".format(name))
+
+ return segments[0]

openpype/hosts/flame/api/pipeline.py

@@ -4,6 +4,7 @@
 import os
 import contextlib
 from avalon import api as avalon
+from avalon.pipeline import AVALON_CONTAINER_ID
 from pyblish import api as pyblish
 from openpype.api import Logger
 from .lib import (
@@ -28,18 +29,6 @@
 
 
 def install():
- # Disable all families except for the ones we explicitly want to see
- family_states = [
- "imagesequence",
- "render2d",
- "plate",
- "render",
- "mov",
- "clip"
- ]
- avalon.data["familiesStateDefault"] = False
- avalon.data["familiesStateToggled"] = family_states
-
 
  pyblish.register_host("flame")
  pyblish.register_plugin_path(PUBLISH_PATH)
@@ -68,14 +57,31 @@ def uninstall():
  log.info("OpenPype Flame host uninstalled ...")
 
 
-def containerise(tl_segment,
+def containerise(flame_clip_segment,
  name,
  namespace,
  context,
  loader=None,
  data=None):
- # TODO: containerise
- pass
+
+ data_imprint = {
+ "schema": "openpype:container-2.0",
+ "id": AVALON_CONTAINER_ID,
+ "name": str(name),
+ "namespace": str(namespace),
+ "loader": str(loader),
+ "representation": str(context["representation"]["_id"]),
+ }
+
+ if data:
+ for k, v in data.items():
+ data_imprint[k] = v
+
+ log.debug("_ data_imprint: {}".format(data_imprint))
+
+ set_segment_data_marker(flame_clip_segment, data_imprint)
+
+ return True
 
 
 def ls():