diff --git a/.github/pr-branch-labeler.yml b/.github/pr-branch-labeler.yml
new file mode 100644
index 0000000000..ca82051006
--- /dev/null
+++ b/.github/pr-branch-labeler.yml
@@ -0,0 +1,15 @@
+# Apply label "feature" if head matches "feature/*"
+'type: feature':
+ head: "feature/*"
+
+# Apply label "feature" if head matches "feature/*"
+'type: enhancement':
+ head: "enhancement/*"
+
+# Apply label "bugfix" if head matches one of "bugfix/*" or "hotfix/*"
+'type: bug':
+ head: ["bugfix/*", "hotfix/*"]
+
+# Apply label "release" if base matches "release/*"
+'Bump Minor':
+ base: "release/next-minor"
\ No newline at end of file
diff --git a/.github/pr-glob-labeler.yml b/.github/pr-glob-labeler.yml
new file mode 100644
index 0000000000..286e7768b5
--- /dev/null
+++ b/.github/pr-glob-labeler.yml
@@ -0,0 +1,102 @@
+# Add type: unittest label if any changes in tests folders
+'type: unittest':
+- '*/*tests*/**/*'
+
+# any changes in documentation structure
+'type: documentation':
+- '*/**/*website*/**/*'
+- '*/**/*docs*/**/*'
+
+# hosts triage
+'host: Nuke':
+- '*/**/*nuke*'
+- '*/**/*nuke*/**/*'
+
+'host: Photoshop':
+- '*/**/*photoshop*'
+- '*/**/*photoshop*/**/*'
+
+'host: Harmony':
+- '*/**/*harmony*'
+- '*/**/*harmony*/**/*'
+
+'host: UE':
+- '*/**/*unreal*'
+- '*/**/*unreal*/**/*'
+
+'host: Houdini':
+- '*/**/*houdini*'
+- '*/**/*houdini*/**/*'
+
+'host: Maya':
+- '*/**/*maya*'
+- '*/**/*maya*/**/*'
+
+'host: Resolve':
+- '*/**/*resolve*'
+- '*/**/*resolve*/**/*'
+
+'host: Blender':
+- '*/**/*blender*'
+- '*/**/*blender*/**/*'
+
+'host: Hiero':
+- '*/**/*hiero*'
+- '*/**/*hiero*/**/*'
+
+'host: Fusion':
+- '*/**/*fusion*'
+- '*/**/*fusion*/**/*'
+
+'host: Flame':
+- '*/**/*flame*'
+- '*/**/*flame*/**/*'
+
+'host: TrayPublisher':
+- '*/**/*traypublisher*'
+- '*/**/*traypublisher*/**/*'
+
+'host: 3dsmax':
+- '*/**/*max*'
+- '*/**/*max*/**/*'
+
+'host: TV Paint':
+- '*/**/*tvpaint*'
+- '*/**/*tvpaint*/**/*'
+
+'host: CelAction':
+- '*/**/*celaction*'
+- '*/**/*celaction*/**/*'
+
+'host: After Effects':
+- '*/**/*aftereffects*'
+- '*/**/*aftereffects*/**/*'
+
+'host: Substance Painter':
+- '*/**/*substancepainter*'
+- '*/**/*substancepainter*/**/*'
+
+# modules triage
+'module: Deadline':
+- '*/**/*deadline*'
+- '*/**/*deadline*/**/*'
+
+'module: RoyalRender':
+- '*/**/*royalrender*'
+- '*/**/*royalrender*/**/*'
+
+'module: Sitesync':
+- '*/**/*sync_server*'
+- '*/**/*sync_server*/**/*'
+
+'module: Ftrack':
+- '*/**/*ftrack*'
+- '*/**/*ftrack*/**/*'
+
+'module: Shotgrid':
+- '*/**/*shotgrid*'
+- '*/**/*shotgrid*/**/*'
+
+'module: Kitsu':
+- '*/**/*kitsu*'
+- '*/**/*kitsu*/**/*'
diff --git a/.github/workflows/project_actions.yml b/.github/workflows/project_actions.yml
index ca94f3ae77..1e1a1441f7 100644
--- a/.github/workflows/project_actions.yml
+++ b/.github/workflows/project_actions.yml
@@ -1,8 +1,8 @@
name: project-actions
on:
- pull_request:
- types: [review_requested]
+ pull_request_target:
+ types: [opened, synchronize, assigned, review_requested]
pull_request_review:
types: [submitted]
@@ -10,7 +10,7 @@ jobs:
pr_review_requested:
name: pr_review_requested
runs-on: ubuntu-latest
- if: github.event_name == 'pull_request' && github.event.action == 'review_requested'
+ if: github.event_name == 'pull_request_review' && github.event.review.state == 'changes_requested'
steps:
- name: Move PR to 'Change Requested'
uses: leonsteinhaeuser/project-beta-automations@v2.1.0
@@ -20,3 +20,53 @@ jobs:
project_id: 11
resource_node_id: ${{ github.event.pull_request.node_id }}
status_value: Change Requested
+
+ size-label:
+ name: pr_size_label
+ runs-on: ubuntu-latest
+ if: |
+ ${{(github.event_name == 'pull_request' && github.event.action == 'assigned')
+ || (github.event_name == 'pull_request' && github.event.action == 'opened')}}
+
+ steps:
+ - name: Add size label
+ uses: "pascalgn/size-label-action@v0.4.3"
+ env:
+ GITHUB_TOKEN: "${{ secrets.YNPUT_BOT_TOKEN }}"
+ IGNORED: ".gitignore\n*.md\n*.json"
+ with:
+ sizes: >
+ {
+ "0": "XS",
+ "100": "S",
+ "500": "M",
+ "1000": "L",
+ "1500": "XL",
+ "2500": "XXL"
+ }
+
+ label_prs_branch:
+ name: pr_branch_label
+ runs-on: ubuntu-latest
+ if: |
+ ${{(github.event_name == 'pull_request' && github.event.action == 'assigned')
+ || (github.event_name == 'pull_request' && github.event.action == 'opened')}}
+ steps:
+ - name: Label PRs - Branch name detection
+ uses: ffittschen/pr-branch-labeler@v1
+ with:
+ repo-token: ${{ secrets.YNPUT_BOT_TOKEN }}
+
+ label_prs_globe:
+ name: pr_globe_label
+ runs-on: ubuntu-latest
+ if: |
+ ${{(github.event_name == 'pull_request' && github.event.action == 'assigned')
+ || (github.event_name == 'pull_request' && github.event.action == 'opened')}}
+ steps:
+ - name: Label PRs - Globe detection
+ uses: actions/labeler@v4.0.3
+ with:
+ repo-token: ${{ secrets.YNPUT_BOT_TOKEN }}
+ configuration-path: ".github/pr-glob-labeler.yml"
+ sync-labels: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 145c2e2c1a..4e22b783c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,931 @@
# Changelog
+## [3.15.3](https://github.com/ynput/OpenPype/tree/3.15.3)
+
+
+[Full Changelog](https://github.com/ynput/OpenPype/compare/3.15.2...3.15.3)
+
+### **π New features**
+
+
+
+Blender: Extract Review #3616
+
+Added Review to Blender.
+
+This implementation is based on #3508 but made compatible for the current implementation of OpenPype for Blender.
+
+
+___
+
+
+
+
+
+Data Exchanges: Point Cloud for 3dsMax #4532
+
+Publish PRT format with tyFlow in 3dsmax
+
+Publish PRT format with tyFlow in 3dsmax and possibly set up loader to load the format too.
+- [x] creator
+- [x] extractor
+- [x] validator
+- [x] loader
+
+
+___
+
+
+
+
+
+Global: persistent staging directory for renders #4583
+
+Allows configure if staging directory (`stagingDir`) should be persistent with use of profiles.
+
+With this feature, users can specify a transient data folder path based on presets, which can be used during the creation and publishing stages. In some cases, these DCCs automatically add a rendering path during the creation stage, which is then used in publishing.One of the key advantages of this feature is that it allows users to take advantage of faster storages for rendering, which can help improve workflow efficiency. Additionally, this feature allows users to keep their rendered data persistent, and use their own infrastructure for regular cleaning.However, it should be noted that some productions may want to use this feature without persistency. Furthermore, there may be a need for retargeting the rendering folder to faster storages, which is also not supported at the moment.It is studio responsibility to clean up obsolete folders with data.Location of the folder is configured in `project_anatomy/templates/others`. ('transient' key is expected, with 'folder' key, could be more templates)Which family/task type/subset is applicable is configured in:`project_settings/global/tools/publish/transient_dir_profiles`
+
+
+___
+
+
+
+
+
+Kitsu custom comment template #4599
+
+Kitsu allows to write markdown in its comment field. This can be something very powerful to deliver dynamic comments with the help the data from the instance.This feature is defaults to off so the admin have to manually set up the comment field the way they want.I have added a basic example on how the comment can look like as the comment-fields default value.To this I want to add some documentation also but that's on its way when the code itself looks good for the reviewers.
+
+
+___
+
+
+
+
+
+MaxScene Family #4615
+
+Introduction of the Max Scene Family
+
+
+___
+
+
+
+### **π Enhancements**
+
+
+
+Maya: Multiple values on single render attribute - OP-4131 #4631
+
+When validating render attributes, this adds support for multiple values. When repairing first value in list is used.
+
+
+___
+
+
+
+
+
+Maya: enable 2D Pan/Zoom for playblasts - OP-5213 #4687
+
+Setting for enabling 2D Pan/Zoom on reviews.
+
+
+___
+
+
+
+
+
+Copy existing or generate new Fusion profile on prelaunch #4572
+
+Fusion preferences will be copied to the predefined `~/.openpype/hosts/fusion/prefs` folder (or any other folder set in system settings) on launch.
+
+The idea is to create a copy of existing Fusion profile, adding an OpenPype menu to the Fusion instance.By default the copy setting is turned off, so no file copying is performed. Instead the clean Fusion profile is created by Fusion in the predefined folder. The default locaion is set to `~/.openpype/hosts/fusion/prefs`, to better comply with the other os platforms. After creating the default profile, some modifications are applied:
+- forced Python3
+- forced English interface
+- setup Openpype specific path maps.If the `copy_prefs` checkbox is toggled, a copy of existing Fusion profile folder will be placed in the mentioned location. Then they are altered the same way as described above. The operation is run only once, on the first launch, unless the `force_sync [Resync profile on each launch]` is toggled.English interface is forced because the `FUSION16_PROFILE_DIR` environment variable is not read otherwise (seems to be a Fusion bug).
+
+
+___
+
+
+
+
+
+Houdini: Create button open new publisher's "create" tab #4601
+
+During a talk with @maxpareschi he mentioned that the new publisher in Houdini felt super confusing due to "Create" going to the older creator but now being completely empty and the publish button directly went to the publish tab.This resolves that by fixing the Create button to now open the new publisher but on the Create tab.Also made publish button enforce going to the "publish" tab for consistency in usage.@antirotor I think changing the Create button's callback was just missed in this commit or was there a specific reason to not change that around yet?
+
+
+___
+
+
+
+
+
+Clockify: refresh and fix the integration #4607
+
+Due to recent API changes, Clockify requires `user_id` to operate with the timers. I updated this part and currently it is a WIP for making it fully functional. Most functions, such as start and stop timer, and projects sync are currently working. For the rate limiting task new dependency is added: https://pypi.org/project/ratelimiter/
+
+
+___
+
+
+
+
+
+Fusion publish existing frames #4611
+
+This PR adds the function to publish existing frames instead of having to re-render all of them for each new publish.I have split the render_locally plugin so the review-part is its own plugin now.I also change the saver-creator-plugin's label from Saver to Render (saver) as I intend to add a Prerender creator like in Nuke.
+
+
+___
+
+
+
+
+
+Resolution settings referenced from DB record for 3dsMax #4652
+
+- Add Callback for setting the resolution according to DB after the new scene is created.
+- Add a new Action into openpype menu which allows the user to reset the resolution in 3dsMax
+
+
+___
+
+
+
+
+
+3dsmax: render instance settings in Publish tab #4658
+
+Allows user preset the pools, group and use_published settings in Render Creator in the Max Hosts.User can set the settings before or after creating instance in the new publisher
+
+
+___
+
+
+
+
+
+scene length setting referenced from DB record for 3dsMax #4665
+
+Setting the timeline length based on DB record in 3dsMax Hosts
+
+
+___
+
+
+
+
+
+Publisher: Windows reduce command window pop-ups during Publishing #4672
+
+Reduce the command line pop-ups that show on Windows during publishing.
+
+
+___
+
+
+
+
+
+Publisher: Explicit save #4676
+
+Publisher have explicit button to save changes, so reset can happen without saving any changes. Save still happens automatically when publishing is started or on publisher window close. But a popup is shown if context of host has changed. Important context was enhanced by workfile path (if host integration supports it) so workfile changes are captured too. In that case a dialog with confirmation is shown to user. All callbacks that may require save of context were moved to main window to be able handle dialog show at one place. Save changes now returns success so the rest of logic is skipped -> publishing won't start, when save of instances fails.Save and reset buttons have shortcuts (Ctrl + s and Ctrls + r).
+
+
+___
+
+
+
+
+
+CelAction: conditional workfile parameters from settings #4677
+
+Since some productions were requesting excluding some workfile parameters from publishing submission, we needed to move them to settings so those could be altered per project.
+
+
+___
+
+
+
+
+
+Improve logging of used app + tool envs on application launch #4682
+
+Improve logging of what apps + tool environments got loaded for an application launch.
+
+
+___
+
+
+
+
+
+Fix name and docstring for Create Workdir Extra Folders prelaunch hook #4683
+
+Fix class name and docstring for Create Workdir Extra Folders prelaunch hookThe class name and docstring were originally copied from another plug-in and didn't match the plug-in logic.This also fixes potentially seeing this twice in your logs. Before:After:Where it was actually running both this prelaunch hook and the actual `AddLastWorkfileToLaunchArgs` plugin.
+
+
+___
+
+
+
+
+
+Application launch context: Include app group name in logger #4684
+
+Clarify in logs better what app group the ApplicationLaunchContext belongs to and what application is being launched.Before:After:
+
+
+___
+
+
+
+
+
+increment workfile version 3dsmax #4685
+
+increment workfile version in 3dsmax as if in blender and maya hosts.
+
+
+___
+
+
+
+### **π Bug fixes**
+
+
+
+Maya: Fix getting non-active model panel. #2968
+
+When capturing multiple cameras with image planes that have file sequences playing, only the active (first) camera will play through the file sequence.
+
+
+___
+
+
+
+
+
+Maya: Fix broken review publishing. #4549
+
+Resolves #4547
+
+
+___
+
+
+
+
+
+Maya: Avoid error on right click in Loader if `mtoa` is not loaded #4616
+
+Fix an error on right clicking in the Loader when `mtoa` is not a loaded plug-in.Additionally if `mtoa` isn't loaded the loader will now load the plug-in before trying to create the arnold standin.
+
+
+___
+
+
+
+
+
+Maya: Fix extract look colorspace detection #4618
+
+Fix the logic which guesses the colorspace using `arnold` python library.
+- Previously it'd error if `mtoa` was not available on path so it still required `mtoa` to be available.
+- The guessing colorspace logic doesn't actually require `mtoa` to be loaded, but just the `arnold` python library to be available. This changes the logic so it doesn't require the `mtoa` plugin to get loaded to guess the colorspace.
+- The if/else branch was likely not doing what was intended `cmds.loadPlugin("mtoa", quiet=True)` returns None if the plug-in was already loaded. So this would only ever be true if it ends up loading the `mtoa` plugin the first time.
+```python
+# Tested in Maya 2022.1
+print(cmds.loadPlugin("mtoa", quiet=True))
+# ['mtoa']
+print(cmds.loadPlugin("mtoa", quiet=True))
+# None
+```
+
+
+___
+
+
+
+
+
+Maya: Maya Playblast Options overrides - OP-3847 #4634
+
+When publishing a review in Maya, the extractor would fail due to wrong (long) panel name.
+
+
+___
+
+
+
+
+
+Bugfix/op 2834 fix extract playblast #4701
+
+Paragraphs contain detailed information on the changes made to the product or service, providing an in-depth description of the updates and enhancements. They can be used to explain the reasoning behind the changes, or to highlight the importance of the new features. Paragraphs can often include links to further information or support documentation.
+
+
+___
+
+
+
+
+
+Bugfix/op 2834 fix extract playblast #4704
+
+Paragraphs contain detailed information on the changes made to the product or service, providing an in-depth description of the updates and enhancements. They can be used to explain the reasoning behind the changes, or to highlight the importance of the new features. Paragraphs can often include links to further information or support documentation.
+
+
+___
+
+
+
+
+
+Maya: bug fix for passing zoom settings if review is attached to subset #4716
+
+Fix for attaching review to subset with pan/zoom option.
+
+
+___
+
+
+
+
+
+Maya: tile assembly fail in draft - OP-4820 #4416
+
+Tile assembly in Deadline was broken.
+
+Initial bug report revealed other areas of the tile assembly that needed fixing.
+
+
+___
+
+
+
+
+
+Maya: Yeti Validate Rig Input - OP-3454 #4554
+
+Fix Yeti Validate Rig Input
+
+Existing workflow was broken due to this #3297.
+
+
+___
+
+
+
+
+
+Scene inventory: Fix code errors when "not found" entries are found #4594
+
+Whenever a "NOT FOUND" entry is present a lot of errors happened in the Scene Inventory:
+- It started spamming a lot of errors for the VersionDelegate since it had no numeric version (no version at all).Error reported on Discord:
+```python
+Traceback (most recent call last):
+ File "C:\Users\videopro\Documents\github\OpenPype\openpype\tools\utils\delegates.py", line 65, in paint
+ text = self.displayText(
+ File "C:\Users\videopro\Documents\github\OpenPype\openpype\tools\utils\delegates.py", line 33, in displayText
+ assert isinstance(value, numbers.Integral), (
+AssertionError: Version is not integer. "None"
+```
+- Right click menu would error on NOT FOUND entries, and thus not show. With this PR it will now _disregard_ not found items for "Set version" and "Remove" but still allow actions.This PR resolves those.
+
+
+___
+
+
+
+
+
+Kitsu: Sync OP with zou, make sure value-data is int or float #4596
+
+Currently the data zou pulls is a string and not a value causing some bugs in the pipe where a value is expected (like `Set frame range` in Fusion).
+
+
+
+This PR makes sure each value is set with int() or float() so these bugs can't happen later on.
+
+
+
+_(A request to cgwire has also bin sent to allow force values only for some metadata columns, but currently the user can enter what ever they want in there)_
+
+
+___
+
+
+
+
+
+Max: fix the bug of removing an instance #4617
+
+fix the bug of removing an instance in 3dsMax
+
+
+___
+
+
+
+
+
+Global | Nuke: fixing farm publishing workflow #4623
+
+After Nuke had adopted new publisher with new creators new issues were introduced. Those issues were addressed with this PR. Those are for example broken reviewable video files publishing if published via farm. Also fixed local publishing.
+
+
+___
+
+
+
+
+
+Ftrack: Ftrack additional families filtering #4633
+
+Ftrack family collector makes sure the subset family is also in instance families for additional families filtering.
+
+
+___
+
+
+
+
+
+Ftrack: Hierarchical <> Non-Hierarchical attributes sync fix #4635
+
+Sync between hierarchical and non-hierarchical attributes should be fixed and work as expected. Action should sync the values as expected and event handler should do it too and only on newly created entities.
+
+
+___
+
+
+
+
+
+bugfix for 3dsmax publishing error #4637
+
+fix the bug of failing publishing job in 3dsMax
+
+
+___
+
+
+
+
+
+General: Use right validation for ffmpeg executable #4640
+
+Use ffmpeg exec validation for ffmpeg executables instead of oiio exec validation. The validation is used as last possible source of ffmpeg from `PATH` environment variables, which is an edge case but can cause issues.
+
+
+___
+
+
+
+
+
+3dsmax: opening last workfile #4644
+
+Supports opening last saved workfile in 3dsmax host.
+
+
+___
+
+
+
+
+
+Fixed a bug where a QThread in the splash screen could be destroyed before finishing execution #4647
+
+This should fix the occasional behavior of the QThread being destroyed before even its worker returns from the `run()` function.After quiting, it should wait for the QThread object to properly close itself.
+
+
+___
+
+
+
+
+
+General: Use right plugin class for Collect Comment #4653
+
+Collect Comment plugin is instance plugin so should inherit from `InstancePlugin` instead of `ContextPlugin`.
+
+
+___
+
+
+
+
+
+Global: add tags field to thumbnail representation #4660
+
+Thumbnail representation might be missing tags field.
+
+
+___
+
+
+
+
+
+Integrator: Enforce unique destination transfers, disallow overwrites in queued transfers #4662
+
+Fix #4656 by enforcing unique destination transfers in the Integrator. It's now disallowed to a destination in the file transaction queue with a new source path during the publish.
+
+
+___
+
+
+
+
+
+Hiero: Creator with correct workfile numeric padding input #4666
+
+Creator was showing 99 in workfile input for long time, even if users set default value to 1001 in studio settings. This has been fixed now.
+
+
+___
+
+
+
+
+
+Nuke: Nukenodes family instance without frame range #4669
+
+No need to add frame range data into `nukenodes` (backdrop) family publishes - since those are timeless.
+
+
+___
+
+
+
+
+
+TVPaint: Optional Validation plugins can be de/activated by user #4674
+
+Added `OptionalPyblishPluginMixin` to TVpaint plugins that can be optional.
+
+
+___
+
+
+
+
+
+Kitsu: Slightly less strict with instance data #4678
+
+- Allow to take task name from context if asset doesn't have any. Fixes an issue with Photoshop's review instance not having `task` in data.
+- Allow to match "review" against both `instance.data["family"]` and `instance.data["families"]` because some instances don't have the primary family in families, e.g. in Photoshop and TVPaint.
+- Do not error on Integrate Kitsu Review whenever for whatever reason Integrate Kitsu Note did not created a comment but just log the message that it was unable to connect a review.
+
+
+___
+
+
+
+
+
+Publisher: Fix reset shortcut sequence #4694
+
+Fix bug created in https://github.com/ynput/OpenPype/pull/4676 where key sequence is checked using unsupported method. The check was changed to convert event into `QKeySequence` object which can be compared to prepared sequence.
+
+
+___
+
+
+
+
+
+Refactor _capture #4702
+
+Paragraphs contain detailed information on the changes made to the product or service, providing an in-depth description of the updates and enhancements. They can be used to explain the reasoning behind the changes, or to highlight the importance of the new features. Paragraphs can often include links to further information or support documentation.
+
+
+___
+
+
+
+
+
+Hiero: correct container colors if UpToDate #4708
+
+Colors on loaded containers are now correctly identifying real state of version. `Red` for out of date and `green` for up to date.
+
+
+___
+
+
+
+### **π Refactored code**
+
+
+
+Look Assigner: Move Look Assigner tool since it's Maya only #4604
+
+Fix #4357: Move Look Assigner tool to maya since it's Maya only
+
+
+___
+
+
+
+
+
+Maya: Remove unused functions from Extract Look #4671
+
+Remove unused functions from Maya Extract Look plug-in
+
+
+___
+
+
+
+
+
+Extract Review code refactor #3930
+
+Trying to reduce complexity of Extract Review plug-in
+- Re-use profile filtering from lib
+- Remove "combination families" additional filtering which supposedly was from OP v2
+- Simplify 'formatting' for filling gaps
+- Use `legacy_io.Session` over `os.environ`
+
+
+___
+
+
+
+
+
+Maya: Replace last usages of Qt module #4610
+
+Replace last usage of `Qt` module with `qtpy`. This change is needed for `PySide6` support. All changes happened in Maya loader plugins.
+
+
+___
+
+
+
+
+
+Update tests and documentation for `ColormanagedPyblishPluginMixin` #4612
+
+Refactor `ExtractorColormanaged` to `ColormanagedPyblishPluginMixin` in tests and documentation.
+
+
+___
+
+
+
+
+
+Improve logging of used app + tool envs on application launch (minor tweak) #4686
+
+Use `app.full_name` for change done in #4682
+
+
+___
+
+
+
+### **π Documentation**
+
+
+
+Docs/add architecture document #4344
+
+Add `ARCHITECTURE.md` document.
+
+his document attemps to give a quick overview of the project to help onboarding, it's not an extensive documentation but more of a elevator pitch one-line descriptions of files/directories and what the attempt to do.
+
+
+___
+
+
+
+
+
+Documentation: Tweak grammar and fix some typos #4613
+
+This resolves some grammar and typos in the documentation.Also fixes the extension of some images in after effects docs which used uppercase extension even though files were lowercase extension.
+
+
+___
+
+
+
+
+
+Docs: Fix some minor grammar/typos #4680
+
+Typo/grammar fixes in documentation.
+
+
+___
+
+
+
+### **Merged pull requests**
+
+
+
+Maya: Implement image file node loader #4313
+
+Implements a loader for loading texture image into a `file` node in Maya.
+
+Similar to Maya's hypershade creation of textures on load you have the option to choose for three modes of creating:
+- Texture
+- Projection
+- StencilThese should match what Maya generates if you create those in Maya.
+- [x] Load and manage file nodes
+- [x] Apply color spaces after #4195
+- [x] Support for _either_ UDIM or image sequence - currently it seems to always load sequences as UDIM automatically.
+- [ ] Add support for animation sequences of UDIM textures using the `..exr` path format?
+
+
+___
+
+
+
+
+
+Maya Look Assigner: Don't rely on containers for get all assets #4600
+
+This resolves #4044 by not actually relying on containers in the scene but instead just rely on finding nodes with `cbId` attributes. As such, imported nodes would also be found and a shader can be assigned (similar to when using get from selection).**Please take into consideration the potential downsides below**Potential downsides would be:
+- IF an already loaded look has any dagNodes, say a 3D Projection node - then that will also show up as a loaded asset where previously nodes from loaded looks were ignored.
+- If any dag nodes were created locally - they would have gotten `cbId` attributes on scene save and thus the current asset would almost always show?
+
+
+___
+
+
+
+
+
+Maya: Unify menu labels for "Set Frame Range" and "Set Resolution" #4605
+
+Fix #4109: Unify menu labels for "Set Frame Range" and "Set Resolution"This also tweaks it in Houdini from Reset Frame Range to Set Frame Range.
+
+
+___
+
+
+
+
+
+Resolve missing OPENPYPE_MONGO in deadline global job preload #4484
+
+In the GlobalJobPreLoad plugin, we propose to replace the SpawnProcess by a sub-process and to pass the environment variables in the parameters, since the SpawnProcess under Centos Linux does not pass the environment variables.
+
+In the GlobalJobPreLoad plugin, the Deadline SpawnProcess is used to start the OpenPype process. The problem is that the SpawnProcess does not pass environment variables, including OPENPYPE_MONGO, to the process when it is under Centos7 linux, and the process gets stuck. We propose to replace it by a subprocess and to pass the variable in the parameters.
+
+
+___
+
+
+
+
+
+Tests: Added setup_only to tests #4591
+
+Allows to download test zip, unzip and restore DB in preparation for new test.
+
+
+___
+
+
+
+
+
+Maya: Arnold don't reset maya timeline frame range on render creation (or setting render settings) #4603
+
+Fix #4429: Do not reset fps or playback timeline on applying or creating render settings
+
+
+___
+
+
+
+
+
+Bump @sideway/formula from 3.0.0 to 3.0.1 in /website #4609
+
+Bumps [@sideway/formula](https://github.com/sideway/formula) from 3.0.0 to 3.0.1.
+
+Commits
+
This version was pushed to npm by marsup, a new releaser for @βsideway/formula since your current version.
+
+
+
+
+[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
+
+Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
+
+[//]: # (dependabot-automerge-start)
+[//]: # (dependabot-automerge-end)
+
+---
+
+
+Dependabot commands and options
+
+
+You can trigger Dependabot actions by commenting on this PR:
+- `@dependabot rebase` will rebase this PR
+- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
+- `@dependabot merge` will merge this PR after your CI passes on it
+- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
+- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
+- `@dependabot reopen` will reopen this PR if it is closed
+- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
+- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
+- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
+- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
+- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
+- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
+- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
+- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
+
+You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/ynput/OpenPype/network/alerts).
+
+
+___
+
+
+
+
+
+Update artist_hosts_maya_arnold.md #4626
+
+Correct Arnold docs.
+___
+
+
+
+
+
+Maya: Add "Include Parent Hierarchy" option in animation creator plugin #4645
+
+Add an option in Project Settings > Maya > Creator Plugins > Create Animation to include (or not) parent hierarchy. This is to avoid artists to check manually the option for all create animation.
+
+
+___
+
+
+
+
+
+General: Filter available applications #4667
+
+Added option to filter applications that don't have valid executable available in settings in launcher and ftrack actions. This option can be disabled in new settings category `Applications`. The filtering is by default disabled.
+
+
+___
+
+
+
+
+
+3dsmax: make sure that startup script executes #4695
+
+Fixing reliability of OpenPype startup in 3dsmax.
+
+
+___
+
+
+
+
+
+Project Manager: Change minimum frame start/end to '0' #4719
+
+Project manager can have frame start/end set to `0`.
+
+
+___
+
+
+
+
+
+## [3.15.2](https://github.com/ynput/OpenPype/tree/3.15.2)
[Full Changelog](https://github.com/ynput/OpenPype/compare/3.15.1...3.15.2)
diff --git a/openpype/hosts/hiero/api/lib.py b/openpype/hosts/hiero/api/lib.py
index bbd1edc14a..0d4368529f 100644
--- a/openpype/hosts/hiero/api/lib.py
+++ b/openpype/hosts/hiero/api/lib.py
@@ -1221,7 +1221,7 @@ def set_track_color(track_item, color):
def check_inventory_versions(track_items=None):
"""
- Actual version color idetifier of Loaded containers
+ Actual version color identifier of Loaded containers
Check all track items and filter only
Loader nodes for its version. It will get all versions from database
@@ -1249,10 +1249,10 @@ def check_inventory_versions(track_items=None):
project_name = legacy_io.active_project()
filter_result = filter_containers(containers, project_name)
for container in filter_result.latest:
- set_track_color(container["_item"], clip_color)
+ set_track_color(container["_item"], clip_color_last)
for container in filter_result.outdated:
- set_track_color(container["_item"], clip_color_last)
+ set_track_color(container["_item"], clip_color)
def selection_changed_timeline(event):
diff --git a/openpype/hosts/houdini/plugins/publish/collect_current_file.py b/openpype/hosts/houdini/plugins/publish/collect_current_file.py
index 9cca07fdc7..caf679f98b 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_current_file.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_current_file.py
@@ -1,7 +1,6 @@
import os
import hou
-from openpype.pipeline import legacy_io
import pyblish.api
@@ -11,7 +10,7 @@ class CollectHoudiniCurrentFile(pyblish.api.InstancePlugin):
order = pyblish.api.CollectorOrder - 0.01
label = "Houdini Current File"
hosts = ["houdini"]
- family = ["workfile"]
+ families = ["workfile"]
def process(self, instance):
"""Inject the current working file"""
@@ -21,7 +20,7 @@ class CollectHoudiniCurrentFile(pyblish.api.InstancePlugin):
# By default, Houdini will even point a new scene to a path.
# However if the file is not saved at all and does not exist,
# we assume the user never set it.
- filepath = ""
+ current_file = ""
elif os.path.basename(current_file) == "untitled.hip":
# Due to even a new file being called 'untitled.hip' we are unable
diff --git a/openpype/hosts/max/api/lib.py b/openpype/hosts/max/api/lib.py
index 39657a2525..ac7d75db08 100644
--- a/openpype/hosts/max/api/lib.py
+++ b/openpype/hosts/max/api/lib.py
@@ -182,7 +182,6 @@ def reset_scene_resolution():
scene resolution can be overwritten by an asset if the asset.data contains
any information regarding scene resolution .
-
Returns:
None
"""
@@ -200,6 +199,59 @@ def reset_scene_resolution():
set_scene_resolution(width, height)
+def get_frame_range() -> dict:
+ """Get the current assets frame range and handles.
+
+ Returns:
+ dict: with frame start, frame end, handle start, handle end.
+ """
+ # Set frame start/end
+ asset = get_current_project_asset()
+ frame_start = asset["data"].get("frameStart")
+ frame_end = asset["data"].get("frameEnd")
+ # Backwards compatibility
+ if frame_start is None or frame_end is None:
+ frame_start = asset["data"].get("edit_in")
+ frame_end = asset["data"].get("edit_out")
+ if frame_start is None or frame_end is None:
+ return
+ handles = asset["data"].get("handles") or 0
+ handle_start = asset["data"].get("handleStart")
+ if handle_start is None:
+ handle_start = handles
+ handle_end = asset["data"].get("handleEnd")
+ if handle_end is None:
+ handle_end = handles
+ return {
+ "frameStart": frame_start,
+ "frameEnd": frame_end,
+ "handleStart": handle_start,
+ "handleEnd": handle_end
+ }
+
+
+def reset_frame_range(fps: bool = True):
+ """Set frame range to current asset.
+ This is part of 3dsmax documentation:
+
+ animationRange: A System Global variable which lets you get and
+ set an Interval value that defines the start and end frames
+ of the Active Time Segment.
+ frameRate: A System Global variable which lets you get
+ and set an Integer value that defines the current
+ scene frame rate in frames-per-second.
+ """
+ if fps:
+ data_fps = get_current_project(fields=["data.fps"])
+ fps_number = float(data_fps["data"]["fps"])
+ rt.frameRate = fps_number
+ frame_range = get_frame_range()
+ frame_start = frame_range["frameStart"] - int(frame_range["handleStart"])
+ frame_end = frame_range["frameEnd"] + int(frame_range["handleEnd"])
+ frange_cmd = f"animationRange = interval {frame_start} {frame_end}"
+ rt.execute(frange_cmd)
+
+
def set_context_setting():
"""Apply the project settings from the project definition
diff --git a/openpype/hosts/max/api/menu.py b/openpype/hosts/max/api/menu.py
index 1f18972394..066cc90039 100644
--- a/openpype/hosts/max/api/menu.py
+++ b/openpype/hosts/max/api/menu.py
@@ -6,6 +6,7 @@ from pymxs import runtime as rt
from openpype.tools.utils import host_tools
from openpype.hosts.max.api import lib
+
class OpenPypeMenu(object):
"""Object representing OpenPype menu.
@@ -114,6 +115,10 @@ class OpenPypeMenu(object):
res_action.triggered.connect(self.resolution_callback)
openpype_menu.addAction(res_action)
+ frame_action = QtWidgets.QAction("Set Frame Range", openpype_menu)
+ frame_action.triggered.connect(self.frame_range_callback)
+ openpype_menu.addAction(frame_action)
+
return openpype_menu
def load_callback(self):
@@ -139,3 +144,7 @@ class OpenPypeMenu(object):
def resolution_callback(self):
"""Callback to reset scene resolution"""
return lib.reset_scene_resolution()
+
+ def frame_range_callback(self):
+ """Callback to reset frame range"""
+ return lib.reset_frame_range()
diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py
index 7c9e311c2f..63e4108c84 100644
--- a/openpype/hosts/max/plugins/publish/collect_render.py
+++ b/openpype/hosts/max/plugins/publish/collect_render.py
@@ -61,7 +61,7 @@ class CollectRender(pyblish.api.InstancePlugin):
"plugin": "3dsmax",
"frameStart": context.data['frameStart'],
"frameEnd": context.data['frameEnd'],
- "version": version_int
+ "version": version_int,
}
self.log.info("data: {0}".format(data))
instance.data.update(data)
diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py
index aa1e501578..1a62e7dbc3 100644
--- a/openpype/hosts/maya/api/lib.py
+++ b/openpype/hosts/maya/api/lib.py
@@ -2478,8 +2478,8 @@ def load_capture_preset(data=None):
float(value[2]) / 255
]
disp_options[key] = value
- else:
- disp_options['displayGradient'] = True
+ elif key == "displayGradient":
+ disp_options[key] = value
options['display_options'] = disp_options
diff --git a/openpype/hosts/maya/plugins/load/load_reference.py b/openpype/hosts/maya/plugins/load/load_reference.py
index d93702a16d..82c15ab899 100644
--- a/openpype/hosts/maya/plugins/load/load_reference.py
+++ b/openpype/hosts/maya/plugins/load/load_reference.py
@@ -1,4 +1,6 @@
import os
+import difflib
+import contextlib
from maya import cmds
from openpype.settings import get_project_settings
@@ -8,7 +10,82 @@ from openpype.pipeline.create import (
get_legacy_creator_by_name,
)
import openpype.hosts.maya.api.plugin
-from openpype.hosts.maya.api.lib import maintained_selection
+from openpype.hosts.maya.api.lib import (
+ maintained_selection,
+ get_container_members
+)
+
+
+@contextlib.contextmanager
+def preserve_modelpanel_cameras(container, log=None):
+ """Preserve camera members of container in the modelPanels.
+
+ This is used to ensure a camera remains in the modelPanels after updating
+ to a new version.
+
+ """
+
+ # Get the modelPanels that used the old camera
+ members = get_container_members(container)
+ old_cameras = set(cmds.ls(members, type="camera", long=True))
+ if not old_cameras:
+ # No need to manage anything
+ yield
+ return
+
+ panel_cameras = {}
+ for panel in cmds.getPanel(type="modelPanel"):
+ cam = cmds.ls(cmds.modelPanel(panel, query=True, camera=True),
+ long=True)
+
+ # Often but not always maya returns the transform from the
+ # modelPanel as opposed to the camera shape, so we convert it
+ # to explicitly be the camera shape
+ if cmds.nodeType(cam) != "camera":
+ cam = cmds.listRelatives(cam,
+ children=True,
+ fullPath=True,
+ type="camera")[0]
+ if cam in old_cameras:
+ panel_cameras[panel] = cam
+
+ if not panel_cameras:
+ # No need to manage anything
+ yield
+ return
+
+ try:
+ yield
+ finally:
+ new_members = get_container_members(container)
+ new_cameras = set(cmds.ls(new_members, type="camera", long=True))
+ if not new_cameras:
+ return
+
+ for panel, cam_name in panel_cameras.items():
+ new_camera = None
+ if cam_name in new_cameras:
+ new_camera = cam_name
+ elif len(new_cameras) == 1:
+ new_camera = next(iter(new_cameras))
+ else:
+ # Multiple cameras in the updated container but not an exact
+ # match detected by name. Find the closest match
+ matches = difflib.get_close_matches(word=cam_name,
+ possibilities=new_cameras,
+ n=1)
+ if matches:
+ new_camera = matches[0] # best match
+ if log:
+ log.info("Camera in '{}' restored with "
+ "closest match camera: {} (before: {})"
+ .format(panel, new_camera, cam_name))
+
+ if not new_camera:
+ # Unable to find the camera to re-apply in the modelpanel
+ continue
+
+ cmds.modelPanel(panel, edit=True, camera=new_camera)
class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
@@ -68,6 +145,9 @@ class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
new_nodes = (list(set(nodes) - set(shapes)))
+ # if there are cameras, try to lock their transforms
+ self._lock_camera_transforms(new_nodes)
+
current_namespace = pm.namespaceInfo(currentNamespace=True)
if current_namespace != ":":
@@ -136,6 +216,15 @@ class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
def switch(self, container, representation):
self.update(container, representation)
+ def update(self, container, representation):
+ with preserve_modelpanel_cameras(container, log=self.log):
+ super(ReferenceLoader, self).update(container, representation)
+
+ # We also want to lock camera transforms on any new cameras in the
+ # reference or for a camera which might have changed names.
+ members = get_container_members(container)
+ self._lock_camera_transforms(members)
+
def _post_process_rig(self, name, namespace, context, options):
output = next((node for node in self if
@@ -168,3 +257,18 @@ class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
options={"useSelection": True},
data={"dependencies": dependency}
)
+
+ def _lock_camera_transforms(self, nodes):
+ cameras = cmds.ls(nodes, type="camera")
+ if not cameras:
+ return
+
+ # Check the Maya version, lockTransform has been introduced since
+ # Maya 2016.5 Ext 2
+ version = int(cmds.about(version=True))
+ if version >= 2016:
+ for camera in cameras:
+ cmds.camera(camera, edit=True, lockTransform=True)
+ else:
+ self.log.warning("This version of Maya does not support locking of"
+ " transforms of cameras.")
diff --git a/openpype/lib/execute.py b/openpype/lib/execute.py
index 7a929a0ade..6f9a095285 100644
--- a/openpype/lib/execute.py
+++ b/openpype/lib/execute.py
@@ -8,6 +8,8 @@ import tempfile
from .log import Logger
from .vendor_bin_utils import find_executable
+from .openpype_version import is_running_from_build
+
# MSDN process creation flag (Windows only)
CREATE_NO_WINDOW = 0x08000000
@@ -200,6 +202,11 @@ def run_openpype_process(*args, **kwargs):
# Skip envs that can affect OpenPype process
# - fill more if you find more
env = clean_envs_for_openpype_process(os.environ)
+
+ # Only keep OpenPype version if we are running from build.
+ if not is_running_from_build():
+ env.pop("OPENPYPE_VERSION", None)
+
return run_subprocess(args, env=env, **kwargs)
diff --git a/openpype/modules/deadline/plugins/publish/collect_pools.py b/openpype/modules/deadline/plugins/publish/collect_pools.py
index 48130848d5..e221eb00ea 100644
--- a/openpype/modules/deadline/plugins/publish/collect_pools.py
+++ b/openpype/modules/deadline/plugins/publish/collect_pools.py
@@ -3,21 +3,60 @@
"""
import pyblish.api
+from openpype.lib import TextDef
+from openpype.pipeline.publish import OpenPypePyblishPluginMixin
-class CollectDeadlinePools(pyblish.api.InstancePlugin):
+class CollectDeadlinePools(pyblish.api.InstancePlugin,
+ OpenPypePyblishPluginMixin):
"""Collect pools from instance if present, from Setting otherwise."""
order = pyblish.api.CollectorOrder + 0.420
label = "Collect Deadline Pools"
- families = ["rendering", "render.farm", "renderFarm", "renderlayer"]
+ families = ["rendering",
+ "render.farm",
+ "renderFarm",
+ "renderlayer",
+ "maxrender"]
primary_pool = None
secondary_pool = None
+ @classmethod
+ def apply_settings(cls, project_settings, system_settings):
+ # deadline.publish.CollectDeadlinePools
+ settings = project_settings["deadline"]["publish"]["CollectDeadlinePools"] # noqa
+ cls.primary_pool = settings.get("primary_pool", None)
+ cls.secondary_pool = settings.get("secondary_pool", None)
+
def process(self, instance):
+
+ attr_values = self.get_attr_values_from_data(instance.data)
if not instance.data.get("primaryPool"):
- instance.data["primaryPool"] = self.primary_pool or "none"
+ instance.data["primaryPool"] = (
+ attr_values.get("primaryPool") or self.primary_pool or "none"
+ )
if not instance.data.get("secondaryPool"):
- instance.data["secondaryPool"] = self.secondary_pool or "none"
+ instance.data["secondaryPool"] = (
+ attr_values.get("secondaryPool") or self.secondary_pool or "none" # noqa
+ )
+
+ @classmethod
+ def get_attribute_defs(cls):
+ # TODO: Preferably this would be an enum for the user
+ # but the Deadline server URL can be dynamic and
+ # can be set per render instance. Since get_attribute_defs
+ # can't be dynamic unfortunately EnumDef isn't possible (yet?)
+ # pool_names = self.deadline_module.get_deadline_pools(deadline_url,
+ # self.log)
+ # secondary_pool_names = ["-"] + pool_names
+
+ return [
+ TextDef("primaryPool",
+ label="Primary Pool",
+ default=cls.primary_pool),
+ TextDef("secondaryPool",
+ label="Secondary Pool",
+ default=cls.secondary_pool)
+ ]
diff --git a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
index 417a03de74..c728b6b9c7 100644
--- a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
@@ -3,7 +3,15 @@ import getpass
import copy
import attr
-from openpype.pipeline import legacy_io
+from openpype.lib import (
+ TextDef,
+ BoolDef,
+ NumberDef,
+)
+from openpype.pipeline import (
+ legacy_io,
+ OpenPypePyblishPluginMixin
+)
from openpype.settings import get_project_settings
from openpype.hosts.max.api.lib import (
get_current_renderer,
@@ -22,7 +30,8 @@ class MaxPluginInfo(object):
IgnoreInputs = attr.ib(default=True)
-class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
+class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
+ OpenPypePyblishPluginMixin):
label = "Submit Render to Deadline"
hosts = ["max"]
@@ -31,14 +40,22 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
use_published = True
priority = 50
- tile_priority = 50
chunk_size = 1
jobInfo = {}
pluginInfo = {}
group = None
- deadline_pool = None
- deadline_pool_secondary = None
- framePerTask = 1
+
+ @classmethod
+ def apply_settings(cls, project_settings, system_settings):
+ settings = project_settings["deadline"]["publish"]["MaxSubmitDeadline"] # noqa
+
+ # Take some defaults from settings
+ cls.use_published = settings.get("use_published",
+ cls.use_published)
+ cls.priority = settings.get("priority",
+ cls.priority)
+ cls.chuck_size = settings.get("chunk_size", cls.chunk_size)
+ cls.group = settings.get("group", cls.group)
def get_job_info(self):
job_info = DeadlineJobInfo(Plugin="3dsmax")
@@ -49,11 +66,11 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
instance = self._instance
context = instance.context
-
# Always use the original work file name for the Job name even when
# rendering is done from the published Work File. The original work
# file name is clearer because it can also have subversion strings,
# etc. which are stripped for the published file.
+
src_filepath = context.data["currentFile"]
src_filename = os.path.basename(src_filepath)
@@ -71,13 +88,13 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
job_info.Pool = instance.data.get("primaryPool")
job_info.SecondaryPool = instance.data.get("secondaryPool")
- job_info.ChunkSize = instance.data.get("chunkSize", 1)
- job_info.Comment = context.data.get("comment")
- job_info.Priority = instance.data.get("priority", self.priority)
- job_info.FramesPerTask = instance.data.get("framesPerTask", 1)
- if self.group:
- job_info.Group = self.group
+ attr_values = self.get_attr_values_from_data(instance.data)
+
+ job_info.ChunkSize = attr_values.get("chunkSize", 1)
+ job_info.Comment = context.data.get("comment")
+ job_info.Priority = attr_values.get("priority", self.priority)
+ job_info.Group = attr_values.get("group", self.group)
# Add options from RenderGlobals
render_globals = instance.data.get("renderGlobals", {})
@@ -216,3 +233,32 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
plugin_info.update(plugin_data)
return job_info, plugin_info
+
+ @classmethod
+ def get_attribute_defs(cls):
+ defs = super(MaxSubmitDeadline, cls).get_attribute_defs()
+ defs.extend([
+ BoolDef("use_published",
+ default=cls.use_published,
+ label="Use Published Scene"),
+
+ NumberDef("priority",
+ minimum=1,
+ maximum=250,
+ decimals=0,
+ default=cls.priority,
+ label="Priority"),
+
+ NumberDef("chunkSize",
+ minimum=1,
+ maximum=50,
+ decimals=0,
+ default=cls.chunk_size,
+ label="Frame Per Task"),
+
+ TextDef("group",
+ default=cls.group,
+ label="Group Name"),
+ ])
+
+ return defs
diff --git a/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py b/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
index 05afa5080d..7c8ab62d4d 100644
--- a/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
+++ b/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
@@ -17,7 +17,11 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
label = "Validate Deadline Pools"
order = pyblish.api.ValidatorOrder
- families = ["rendering", "render.farm", "renderFarm", "renderlayer"]
+ families = ["rendering",
+ "render.farm",
+ "renderFarm",
+ "renderlayer",
+ "maxrender"]
optional = True
def process(self, instance):
diff --git a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py
index 6be14b3bdf..f8e56377bb 100644
--- a/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py
+++ b/openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py
@@ -14,7 +14,10 @@ class IntegrateKitsuNote(pyblish.api.ContextPlugin):
# status settings
set_status_note = False
note_status_shortname = "wfa"
- status_conditions = list()
+ status_change_conditions = {
+ "status_conditions": [],
+ "family_requirements": [],
+ }
# comment settings
custom_comment_template = {
@@ -55,7 +58,7 @@ class IntegrateKitsuNote(pyblish.api.ContextPlugin):
continue
kitsu_task = instance.data.get("kitsu_task")
- if kitsu_task is None:
+ if not kitsu_task:
continue
# Get note status, by default uses the task status for the note
@@ -65,13 +68,39 @@ class IntegrateKitsuNote(pyblish.api.ContextPlugin):
# Check if any status condition is not met
allow_status_change = True
- for status_cond in self.status_conditions:
+ for status_cond in self.status_change_conditions[
+ "status_conditions"
+ ]:
condition = status_cond["condition"] == "equal"
match = status_cond["short_name"].upper() == shortname
if match and not condition or condition and not match:
allow_status_change = False
break
+ if allow_status_change:
+ # Get families
+ families = {
+ instance.data.get("family")
+ for instance in context
+ if instance.data.get("publish")
+ }
+
+ # Check if any family requirement is met
+ for family_requirement in self.status_change_conditions[
+ "family_requirements"
+ ]:
+ condition = family_requirement["condition"] == "equal"
+
+ for family in families:
+ match = family_requirement["family"].lower() == family
+ if match and not condition or condition and not match:
+ allow_status_change = False
+ break
+
+ if allow_status_change:
+ break
+
+ # Set note status
if self.set_status_note and allow_status_change:
kitsu_status = gazu.task.get_task_status_by_short_name(
self.note_status_shortname
diff --git a/openpype/plugins/publish/extract_burnin.py b/openpype/plugins/publish/extract_burnin.py
index 44ba4a5025..95575444b2 100644
--- a/openpype/plugins/publish/extract_burnin.py
+++ b/openpype/plugins/publish/extract_burnin.py
@@ -252,6 +252,9 @@ class ExtractBurnin(publish.Extractor):
# Add context data burnin_data.
burnin_data["custom"] = custom_data
+ # Add data members.
+ burnin_data.update(instance.data.get("burninDataMembers", {}))
+
# Add source camera name to burnin data
camera_name = repre.get("camera_name")
if camera_name:
diff --git a/openpype/scripts/otio_burnin.py b/openpype/scripts/otio_burnin.py
index ef449f4f74..d0a4266941 100644
--- a/openpype/scripts/otio_burnin.py
+++ b/openpype/scripts/otio_burnin.py
@@ -4,8 +4,10 @@ import re
import subprocess
import platform
import json
-import opentimelineio_contrib.adapters.ffmpeg_burnins as ffmpeg_burnins
+import tempfile
+from string import Formatter
+import opentimelineio_contrib.adapters.ffmpeg_burnins as ffmpeg_burnins
from openpype.lib import (
get_ffmpeg_tool_path,
get_ffmpeg_codec_args,
@@ -23,7 +25,7 @@ FFMPEG = (
).format(ffmpeg_path)
DRAWTEXT = (
- "drawtext=fontfile='%(font)s':text=\\'%(text)s\\':"
+ "drawtext@'%(label)s'=fontfile='%(font)s':text=\\'%(text)s\\':"
"x=%(x)s:y=%(y)s:fontcolor=%(color)s@%(opacity).1f:fontsize=%(size)d"
)
TIMECODE = (
@@ -39,6 +41,45 @@ TIMECODE_KEY = "{timecode}"
SOURCE_TIMECODE_KEY = "{source_timecode}"
+def convert_list_to_command(list_to_convert, fps, label=""):
+ """Convert a list of values to a drawtext command file for ffmpeg `sendcmd`
+
+ The list of values is expected to have a value per frame. If the video
+ file ends up being longer than the amount of samples per frame than the
+ last value will be held.
+
+ Args:
+ list_to_convert (list): List of values per frame.
+ fps (float or int): The expected frame per seconds of the output file.
+ label (str): Label for the drawtext, if specific drawtext filter is
+ required
+
+ Returns:
+ str: Filepath to the temporary drawtext command file.
+
+ """
+
+ with tempfile.NamedTemporaryFile(mode="w", delete=False) as f:
+ for i, value in enumerate(list_to_convert):
+ seconds = i / fps
+
+ # Escape special character
+ value = str(value).replace(":", "\\:")
+
+ filter = "drawtext"
+ if label:
+ filter += "@" + label
+
+ line = (
+ "{start} {filter} reinit text='{value}';"
+ "\n".format(start=seconds, filter=filter, value=value)
+ )
+
+ f.write(line)
+ f.flush()
+ return f.name
+
+
def _get_ffprobe_data(source):
"""Reimplemented from otio burnins to be able use full path to ffprobe
:param str source: source media file
@@ -144,7 +185,13 @@ class ModifiedBurnins(ffmpeg_burnins.Burnins):
self.options_init.update(options_init)
def add_text(
- self, text, align, frame_start=None, frame_end=None, options=None
+ self,
+ text,
+ align,
+ frame_start=None,
+ frame_end=None,
+ options=None,
+ cmd=""
):
"""
Adding static text to a filter.
@@ -165,7 +212,13 @@ class ModifiedBurnins(ffmpeg_burnins.Burnins):
if frame_end is not None:
options["frame_end"] = frame_end
- self._add_burnin(text, align, options, DRAWTEXT)
+ draw_text = DRAWTEXT
+ if cmd:
+ draw_text = "{}, {}".format(cmd, DRAWTEXT)
+
+ options["label"] = align
+
+ self._add_burnin(text, align, options, draw_text)
def add_timecode(
self, align, frame_start=None, frame_end=None, frame_start_tc=None,
@@ -408,11 +461,13 @@ def burnins_from_data(
True by default.
Presets must be set separately. Should be dict with 2 keys:
- - "options" - sets look of burnins - colors, opacity,...(more info: ModifiedBurnins doc)
+ - "options" - sets look of burnins - colors, opacity,...
+ (more info: ModifiedBurnins doc)
- *OPTIONAL* default values are used when not included
- "burnins" - contains dictionary with burnins settings
- *OPTIONAL* burnins won't be added (easier is not to use this)
- - each key of "burnins" represents Alignment, there are 6 possibilities:
+ - each key of "burnins" represents Alignment,
+ there are 6 possibilities:
TOP_LEFT TOP_CENTERED TOP_RIGHT
BOTTOM_LEFT BOTTOM_CENTERED BOTTOM_RIGHT
- value must be string with text you want to burn-in
@@ -491,13 +546,14 @@ def burnins_from_data(
if source_timecode is not None:
data[SOURCE_TIMECODE_KEY[1:-1]] = SOURCE_TIMECODE_KEY
+ clean_up_paths = []
for align_text, value in burnin_values.items():
if not value:
continue
- if isinstance(value, (dict, list, tuple)):
+ if isinstance(value, dict):
raise TypeError((
- "Expected string or number type."
+ "Expected string, number or list type."
" Got: {} - \"{}\""
" (Make sure you have new burnin presets)."
).format(str(type(value)), str(value)))
@@ -533,8 +589,48 @@ def burnins_from_data(
print("Source does not have set timecode value.")
value = value.replace(SOURCE_TIMECODE_KEY, MISSING_KEY_VALUE)
- key_pattern = re.compile(r"(\{.*?[^{0]*\})")
+ # Convert lists.
+ cmd = ""
+ text = None
+ keys = [i[1] for i in Formatter().parse(value) if i[1] is not None]
+ list_to_convert = []
+ # Warn about nested dictionary support for lists. Ei. we dont support
+ # it.
+ if "[" in "".join(keys):
+ print(
+ "We dont support converting nested dictionaries to lists,"
+ " so skipping {}".format(value)
+ )
+ else:
+ for key in keys:
+ data_value = data[key]
+
+ # Multiple lists are not supported.
+ if isinstance(data_value, list) and list_to_convert:
+ raise ValueError(
+ "Found multiple lists to convert, which is not "
+ "supported: {}".format(value)
+ )
+
+ if isinstance(data_value, list):
+ print("Found list to convert: {}".format(data_value))
+ for v in data_value:
+ data[key] = v
+ list_to_convert.append(value.format(**data))
+
+ if list_to_convert:
+ value = list_to_convert[0]
+ path = convert_list_to_command(
+ list_to_convert, data["fps"], label=align
+ )
+ cmd = "sendcmd=f='{}'".format(path)
+ cmd = cmd.replace("\\", "/")
+ cmd = cmd.replace(":", "\\:")
+ clean_up_paths.append(path)
+
+ # Failsafe for missing keys.
+ key_pattern = re.compile(r"(\{.*?[^{0]*\})")
missing_keys = []
for group in key_pattern.findall(value):
try:
@@ -568,7 +664,8 @@ def burnins_from_data(
continue
text = value.format(**data)
- burnin.add_text(text, align, frame_start, frame_end)
+
+ burnin.add_text(text, align, frame_start, frame_end, cmd=cmd)
ffmpeg_args = []
if codec_data:
@@ -599,6 +696,8 @@ def burnins_from_data(
burnin.render(
output_path, args=ffmpeg_args_str, overwrite=overwrite, **data
)
+ for path in clean_up_paths:
+ os.remove(path)
if __name__ == "__main__":
diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json
index 0cbd323299..fdd70f1a44 100644
--- a/openpype/settings/defaults/project_settings/deadline.json
+++ b/openpype/settings/defaults/project_settings/deadline.json
@@ -43,10 +43,7 @@
"use_published": true,
"priority": 50,
"chunk_size": 10,
- "group": "none",
- "deadline_pool": "",
- "deadline_pool_secondary": "",
- "framePerTask": 1
+ "group": "none"
},
"NukeSubmitDeadline": {
"enabled": true,
diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json
index aba840da78..30e56300d1 100644
--- a/openpype/settings/defaults/project_settings/global.json
+++ b/openpype/settings/defaults/project_settings/global.json
@@ -249,6 +249,29 @@
}
}
}
+ },
+ {
+ "families": [],
+ "hosts": [
+ "maya"
+ ],
+ "task_types": [],
+ "task_names": [],
+ "subsets": [],
+ "burnins": {
+ "maya_burnin": {
+ "TOP_LEFT": "{yy}-{mm}-{dd}",
+ "TOP_CENTERED": "{focalLength:.2f} mm",
+ "TOP_RIGHT": "{anatomy[version]}",
+ "BOTTOM_LEFT": "{username}",
+ "BOTTOM_CENTERED": "{asset}",
+ "BOTTOM_RIGHT": "{frame_start}-{current_frame}-{frame_end}",
+ "filter": {
+ "families": [],
+ "tags": []
+ }
+ }
+ }
}
]
},
diff --git a/openpype/settings/defaults/project_settings/kitsu.json b/openpype/settings/defaults/project_settings/kitsu.json
index 0638450595..59a36d8b97 100644
--- a/openpype/settings/defaults/project_settings/kitsu.json
+++ b/openpype/settings/defaults/project_settings/kitsu.json
@@ -8,7 +8,10 @@
"IntegrateKitsuNote": {
"set_status_note": false,
"note_status_shortname": "wfa",
- "status_conditions": [],
+ "status_change_conditions": {
+ "status_conditions": [],
+ "family_requirements": []
+ },
"custom_comment_template": {
"enabled": false,
"comment_template": "{comment}\n\n| | |\n|--|--|\n| version| `{version}` |\n| family | `{family}` |\n| name | `{name}` |"
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index e914eb29f9..fda053e6e6 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -795,6 +795,7 @@
"quality": 95
},
"Display Options": {
+ "override_display": true,
"background": [
125,
125,
@@ -813,7 +814,7 @@
125,
255
],
- "override_display": true
+ "displayGradient": true
},
"Generic": {
"isolate_view": true,
diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json
index 5fd9b926fb..eb3a88ce66 100644
--- a/openpype/settings/defaults/system_settings/applications.json
+++ b/openpype/settings/defaults/system_settings/applications.json
@@ -133,7 +133,7 @@
"linux": []
},
"arguments": {
- "windows": [],
+ "windows": ["-U MAXScript {OPENPYPE_ROOT}\\openpype\\hosts\\max\\startup\\startup.ms"],
"darwin": [],
"linux": []
},
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
index 9906939cc7..d8b5e4dc1f 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
@@ -239,27 +239,12 @@
{
"type": "number",
"key": "chunk_size",
- "label": "Chunk Size"
+ "label": "Frame per Task"
},
{
"type": "text",
"key": "group",
"label": "Group Name"
- },
- {
- "type": "text",
- "key": "deadline_pool",
- "label": "Deadline pool"
- },
- {
- "type": "text",
- "key": "deadline_pool_secondary",
- "label": "Deadline pool (secondary)"
- },
- {
- "type": "number",
- "key": "framePerTask",
- "label": "Frame Per Task"
}
]
},
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_kitsu.json b/openpype/settings/entities/schemas/projects_schema/schema_project_kitsu.json
index ee309f63a7..8aeed00542 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_kitsu.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_kitsu.json
@@ -54,30 +54,62 @@
"label": "Note shortname"
},
{
- "type": "list",
- "key": "status_conditions",
- "label": "Status conditions",
- "object_type": {
- "type": "dict",
- "key": "conditions_dict",
- "children": [
- {
- "type": "enum",
- "key": "condition",
- "label": "Condition",
- "enum_items": [
- {"equal": "Equal"},
- {"not_equal": "Not equal"}
+ "type": "dict",
+ "collapsible": true,
+ "key": "status_change_conditions",
+ "label": "Status change conditions",
+ "children": [
+ {
+ "type": "list",
+ "key": "status_conditions",
+ "label": "Status conditions",
+ "object_type": {
+ "type": "dict",
+ "key": "condition_dict",
+ "children": [
+ {
+ "type": "enum",
+ "key": "condition",
+ "label": "Condition",
+ "enum_items": [
+ {"equal": "Equal"},
+ {"not_equal": "Not equal"}
+ ]
+ },
+ {
+ "type": "text",
+ "key": "short_name",
+ "label": "Short name"
+ }
]
- },
- {
- "type": "text",
- "key": "short_name",
- "label": "Short name"
}
- ]
- },
- "label": "Status shortname"
+ },
+ {
+ "type": "list",
+ "key": "family_requirements",
+ "label": "Family requirements",
+ "object_type": {
+ "type": "dict",
+ "key": "requirement_dict",
+ "children": [
+ {
+ "type": "enum",
+ "key": "condition",
+ "label": "Condition",
+ "enum_items": [
+ {"equal": "Equal"},
+ {"not_equal": "Not equal"}
+ ]
+ },
+ {
+ "type": "text",
+ "key": "family",
+ "label": "Family"
+ }
+ ]
+ }
+ }
+ ]
},
{
"type": "dict",
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index dec5a5cdc2..a4a986bad8 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -19,12 +19,12 @@
{
"type": "text",
"key": "compression",
- "label": "Compression type"
+ "label": "Encoding"
},
{
"type": "text",
"key": "format",
- "label": "Data format"
+ "label": "Format"
},
{
"type": "number",
@@ -48,7 +48,11 @@
"type": "label",
"label": "Display Options"
},
-
+ {
+ "type": "boolean",
+ "key": "override_display",
+ "label": "Override display options"
+ },
{
"type": "color",
"key": "background",
@@ -66,8 +70,8 @@
},
{
"type": "boolean",
- "key": "override_display",
- "label": "Override display options"
+ "key": "displayGradient",
+ "label": "Display background gradient"
}
]
},
diff --git a/openpype/tools/project_manager/project_manager/view.py b/openpype/tools/project_manager/project_manager/view.py
index b35491c5b2..2cf11b702d 100644
--- a/openpype/tools/project_manager/project_manager/view.py
+++ b/openpype/tools/project_manager/project_manager/view.py
@@ -72,8 +72,8 @@ class HierarchyView(QtWidgets.QTreeView):
column_delegate_defs = {
"name": NameDef(),
"type": TypeDef(),
- "frameStart": NumberDef(1),
- "frameEnd": NumberDef(1),
+ "frameStart": NumberDef(0),
+ "frameEnd": NumberDef(0),
"fps": NumberDef(1, decimals=3, step=1),
"resolutionWidth": NumberDef(0),
"resolutionHeight": NumberDef(0),
diff --git a/openpype/version.py b/openpype/version.py
index bc5ea7fe7c..4d6ee5590e 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
"""Package declaring Pype version."""
-__version__ = "3.15.3-nightly.4"
+__version__ = "3.15.4-nightly.1"
diff --git a/pyproject.toml b/pyproject.toml
index 02370a4f10..42ce5aa32c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "OpenPype"
-version = "3.15.2" # OpenPype
+version = "3.15.3" # OpenPype
description = "Open VFX and Animation pipeline with support."
authors = ["OpenPype Team "]
license = "MIT License"
diff --git a/website/docs/assets/integrate_kitsu_note_settings.png b/website/docs/assets/integrate_kitsu_note_settings.png
index 127e79ab80..9c59f0bf5c 100644
Binary files a/website/docs/assets/integrate_kitsu_note_settings.png and b/website/docs/assets/integrate_kitsu_note_settings.png differ
diff --git a/website/docs/module_kitsu.md b/website/docs/module_kitsu.md
index 23898fba2e..05cff87fcc 100644
--- a/website/docs/module_kitsu.md
+++ b/website/docs/module_kitsu.md
@@ -43,10 +43,11 @@ Task status can be automatically set during publish thanks to `Integrate Kitsu N
`Admin -> Studio Settings -> Project Settings -> Kitsu -> Integrate Kitsu Note`.
-There are three settings available:
-- `Set status on note` -> turns on and off this integrator.
+There are four settings available:
+- `Set status on note` -> Turns on and off this integrator.
- `Note shortname` -> Which status shortname should be set automatically (Case sensitive).
-- `Status conditions` -> Conditions that need to be met for kitsu status to be changed. You can add as many conditions as you like. There are two fields to each conditions: `Condition` (Whether current status should be equal or not equal to the condition status) and `Short name` (Kitsu Shortname of the condition status).
+- `Status change conditions - Status conditions` -> Conditions that need to be met for kitsu status to be changed. You can add as many conditions as you like. There are two fields to each conditions: `Condition` (Whether current status should be equal or not equal to the condition status) and `Short name` (Kitsu Shortname of the condition status).
+- `Status change conditions - Family requirements` -> With this option you can add requirements to which families must be pushed or not in order to have the task status set by this integrator. There are two fields for each requirements: `Condition` (Same as the above) and `Family` (name of the family concerned by this requirement). For instance, adding one item set to `Not equal` and `workfile`, would mean the task status would change if a subset from another family than workfile is published (workfile can still be included), but not if you publish the workfile subset only.
diff --git a/website/docs/pype2/admin_presets_plugins.md b/website/docs/pype2/admin_presets_plugins.md
index e589f7d14b..44c2a28dec 100644
--- a/website/docs/pype2/admin_presets_plugins.md
+++ b/website/docs/pype2/admin_presets_plugins.md
@@ -293,6 +293,7 @@ If source representation has suffix **"h264"** and burnin suffix is **"client"**
- It is allowed to use [Anatomy templates](admin_config#anatomy) themselves in burnins if they can be filled with available data.
- Additional keys in burnins:
+
| Burnin key | Description |
| --- | --- |
| frame_start | First frame number. |
@@ -303,6 +304,7 @@ If source representation has suffix **"h264"** and burnin suffix is **"client"**
| resolution_height | Resolution height. |
| fps | Fps of an output. |
| timecode | Timecode by frame start and fps. |
+ | focalLength | **Only available in Maya**
Camera focal length per frame. Use syntax `{focalLength:.2f}` for decimal truncating. Eg. `35.234985` with `{focalLength:.2f}` would produce `35.23`, whereas `{focalLength:.0f}` would produce `35`. |
:::warning
`timecode` is specific key that can be **only at the end of content**. (`"BOTTOM_RIGHT": "TC: {timecode}"`)