diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index f59eb1edb1..fd3455ac76 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -35,6 +35,16 @@ body:
label: Version
description: What version are you running? Look to OpenPype Tray
options:
+ - 3.18.2-nightly.2
+ - 3.18.2-nightly.1
+ - 3.18.1
+ - 3.18.1-nightly.1
+ - 3.18.0
+ - 3.17.7
+ - 3.17.7-nightly.7
+ - 3.17.7-nightly.6
+ - 3.17.7-nightly.5
+ - 3.17.7-nightly.4
- 3.17.7-nightly.3
- 3.17.7-nightly.2
- 3.17.7-nightly.1
@@ -125,16 +135,6 @@ body:
- 3.15.4
- 3.15.4-nightly.3
- 3.15.4-nightly.2
- - 3.15.4-nightly.1
- - 3.15.3
- - 3.15.3-nightly.4
- - 3.15.3-nightly.3
- - 3.15.3-nightly.2
- - 3.15.3-nightly.1
- - 3.15.2
- - 3.15.2-nightly.6
- - 3.15.2-nightly.5
- - 3.15.2-nightly.4
validations:
required: true
- type: dropdown
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5909c26f7e..f309d904eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,1146 @@
# Changelog
+## [3.18.1](https://github.com/ynput/OpenPype/tree/3.18.1)
+
+
+[Full Changelog](https://github.com/ynput/OpenPype/compare/3.18.0...3.18.1)
+
+### **π Enhancements**
+
+
+
+AYON: Update ayon api to 1.0.0-rc.3 #6052
+
+Updated ayon python api to 1.0.0-rc.3.
+
+
+___
+
+
+
+
+
+
+## [3.18.0](https://github.com/ynput/OpenPype/tree/3.18.0)
+
+
+[Full Changelog](https://github.com/ynput/OpenPype/compare/...3.18.0)
+
+### **π Bug fixes**
+
+
+
+Chore: Fix subst paths handling #5702
+
+Make sure that source disk ends with `\` instead of destination disk.
+
+
+___
+
+
+
+
+
+
+## [3.17.7](https://github.com/ynput/OpenPype/tree/3.17.7)
+
+
+[Full Changelog](https://github.com/ynput/OpenPype/compare/3.17.6...3.17.7)
+
+### **π New features**
+
+
+
+AYON: Use folder path as unique identifier #5817
+
+Use folder path instead of asset name as unique identifier, with OpenPype compatibility.
+
+
+___
+
+
+
+
+
+Houdini: Farm caching submission to Deadline #4903
+
+Implements functionality to offload instances of the specific families to be processed on Deadline instead of locally. This increases productivity as artist can use local machine could be used for other tasks.Implemented for families:
+- [x] ass
+- [x] redshift proxy
+- [x] ifd
+- [x] abc
+- [x] bgeo
+- [x] vdb
+
+
+___
+
+
+
+
+
+Houdini: Add support to split Deadline render tasks in export + render #5420
+
+This adds initial support in Houdini so when submitting render jobs to Deadline it's not running as a single Houdini task but rather it gets split in two different tasks: Export + Render. This way it's more efficient as we only need a Houdini license during the export step and the render tasks can run exclusively with a render license. Moreover, we aren't wasting all the overhead time of opening the render scene in Houdini for every frame.I have also added the corresponding settings json files so we can set some of the default values for the Houdini deadline submitter.
+
+
+___
+
+
+
+
+
+Wrap: new integration #5823
+
+These modifications are necessary for adding Wrap integration (DCC handling scans and textures) .
+
+
+___
+
+
+
+
+
+AYON: Prepare for 'data' via graphql #5923
+
+AYON server does support to query 'data' field for hierarchy entities (project > ... > representation) using GraphQl since version 0.5.5. Because of this PR in ayon-python-api it is required to modify custom graphql function in `openpype.client` to support that option.
+
+
+___
+
+
+
+
+
+Chore AYON: AYON addon class #5937
+
+Introduced base class for AYON addon in openpype modules discovery logic.
+
+
+___
+
+
+
+
+
+Asset Usage Reporter Tool #5946
+
+This adds simple tool for OpenPype mode that will go over all published workfiles and print linked assets and their version:This is created per project and can be exported in csv file or copied to clipboard in _"ASCII Human readable form"_.
+
+
+___
+
+
+
+
+
+Testing: dump_databases flag #5955
+
+This introduces a `dump_databases` flag which makes it convenient to output the resulting database of a successful test run. The flag supports two formats; `bson` and `json`.Due to outputting to the test data folder, when dumping the databases, the test data folder will persist.Split from https://github.com/ynput/OpenPype/pull/5644
+
+
+___
+
+
+
+
+
+SiteSync: implemented in Ayon Loader #5962
+
+Implemented `Availability` column in Ayon loader and redo of loaders to `ActionItems` in representation window there.
+
+
+___
+
+
+
+
+
+AYON: Workfile template build works #5975
+
+Modified workfile template builder to work, to some degree, in AYON mode.
+
+
+___
+
+
+
+### **π Enhancements**
+
+
+
+Maya: Small Tweaks on Validator for Look Default Shader Connection for Maya 2024 #5957
+
+Resolve https://github.com/ynput/OpenPype/issues/5269
+
+
+___
+
+
+
+
+
+Settings: Changes in default settings #5983
+
+We've made some changes in the default settings as several application versions were obsolete (Maya 18, Nuke 11, PS 2020, etc). Also added tools and changed settings for Blender, Maya, and Blender.
+
+All should work as usual.
+___
+
+
+
+
+
+Testing: Do not persist data by default in Maya/Deadline. #5987
+
+This is similar to the Maya publishing test.
+
+
+___
+
+
+
+
+
+Max: Validate loaded plugins tweaks #5820
+
+In the current development of 3dsMax, users need to use separate validators to validate if certain plugins being loaded before the extraction. For example, usd extractor in model family, prt/tycache extractor in pointcloud/tycache family.But with the PR where implements optional validate loaded plugin, users just need to put what kind of plugins they want to validate in the settings. They no longer need to go through all the separate plugin validators when publishing, and only one validator would do all the check on the loaded plugins before extraction.
+
+
+___
+
+
+
+
+
+Nuke: Change context label enhancement #5887
+
+Use QAction to change label of context label in Nuke pipeline menu.
+
+
+___
+
+
+
+
+
+Chore: Do not use template data as source for context #5918
+
+Use available information on context to receive context data instead of using `"anatomyData"` during publishing.
+
+
+___
+
+
+
+
+
+Houdini: Add python3.10 libs for Houdini 20 startup #5932
+
+Add python3.10 libs for Houdini 20 startup
+
+
+___
+
+
+
+
+
+General: Use colorspace data when creating thumbnail #5938
+
+Thumbnails with applied colormanagement.
+
+
+___
+
+
+
+
+
+Ftrack: rewriting component creation to support multiple thumbnails #5939
+
+The creation of Ftrack components needs to allow for multiple thumbnails. This is important in situations where there could be several reviewable streams, like in the case of a nuke intermediate files preset. Customers have asked for unique thumbnails for each data stream.For instance, one stream might contain a baked LUT file along with Display and View. Another stream might only include the baked Display and View. These variations can change the overall look. Thus, we found it necessary to depict these differences via thumbnails.
+
+
+___
+
+
+
+
+
+Chore: PySide6 tree view style #5940
+
+Define solid color for background of branch in QTreeView.
+
+
+___
+
+
+
+
+
+Nuke: Explicit Thumbnail workflow #5941
+
+Nuke made a shift from using its own plugin to a global one for thumbnail creation. This was because it had to handle several thumbnail workflows for baking intermediate data streams. To manage this, the global plugin had to be upgraded. Now, each baking stream can set a unique tag 'need_thumbnail'. This tag is used to mark representations that need a thumbnail.
+
+
+___
+
+
+
+
+
+Global: extract thumbnail with new settings #5944
+
+Settings are now configurable for the following:
+- target size of thumbnail - source or constrained to specific
+- where should be frame taken from in sequence or video file
+- if thumbnail should be integrated or not
+- background color for letter boxes
+- added AYON settings
+
+
+___
+
+
+
+
+
+RoyalRender: inject submitter environment to the royal render job #5958
+
+This is an attempt to solve runtime environment injection for render jobs in RoyalRender as there is no easy way to implement something like `GlobalJobPreload` logic in Deadline. Idea is to inject OpenPype environments directly to the job itself.
+
+
+___
+
+
+
+
+
+General: Use manual thumbnail if present when publishing #5969
+
+Use manual thumbnail added to the publisher instead of using it from published representation.
+
+
+___
+
+
+
+
+
+AYON: Change of server url should work as expected #5971
+
+Using login action in tray menu to change server url should correctly start new process without issues of missing bundle or previous url.
+
+
+___
+
+
+
+
+
+AYON: make sure the AYON menu bar in 3dsMax is named AYON when AYON launches #5972
+
+Renaming the menu bar in 3dsMax for AYON and some cosmetic fix in the docstring
+
+
+___
+
+
+
+
+
+Resolve: renaming menu to AYON #5974
+
+Resolve in Ayon is now having aligned name.
+
+
+___
+
+
+
+
+
+Hiero: custom tools menu rename #5976
+
+- OpenPype Tools are now Custom Tools menu
+- fixing order of tools. Create should be first.
+
+
+___
+
+
+
+
+
+nuke: updating name for custom tools menu item #5977
+
+- Ayon variant of settings renamed `Custom Tools` menu item
+
+
+___
+
+
+
+
+
+fusion: AYON renaming menu #5978
+
+Fusion is having Ayon menu.
+
+
+___
+
+
+
+
+
+Blender: Changed the labels for Layout JSON Extractor #5981
+
+Changed the labels for Blender's Layout JSON Extractor.
+
+
+___
+
+
+
+
+
+Testing: Skip Arnold license for test rendering. #5984
+
+Skip license check when rendering for testing.
+
+
+___
+
+
+
+
+
+Testing: Validate errors and failed status from Deadline jobs. #5986
+
+While waiting for the Deadline jobs to finish, we query the errors on the job and its dependent jobs to fail as early as possible. Plus the failed status.
+
+
+___
+
+
+
+
+
+AYON: rename Openpype Tools as Custom Tools in Maya Host #5991
+
+Rename Openpype Tools as Custom Tools in Maya Host in
+
+
+___
+
+
+
+
+
+AYON: Use AYON label in ayon mode #5995
+
+Replaced OpenPype with AYON in AYON mode and added bundle nam to information.
+
+
+___
+
+
+
+
+
+AYON: Update ayon python api #6002
+
+Updated ayon-python-api to '1.0.0-rc.1'.
+
+
+___
+
+
+
+
+
+Max: Add missing repair action in validate resolution setting #6014
+
+Add missing repair action for validate resolution setting
+
+
+___
+
+
+
+
+
+Add the AYON/OP settings to enable extractor for model family in 3dsmax #6027
+
+Add the AYON/OP settings to enable extractor for model family in 3dsmax
+
+
+___
+
+
+
+
+
+Bugfix: Fix error message formatting if ayon executable can't be found by deadline #6028
+
+Without this fix the error message would report executables string with `;` between EACH character, similar to this PR: https://github.com/ynput/OpenPype/pull/5815However that PR apparently missed also fixing it in `GlobalJobPreLoad` and only fixed it in `Ayon.py` plugin.
+
+
+___
+
+
+
+
+
+Show slightly different info in AYON mode #6031
+
+This PR changes what is shown in Tray menu in AYON mode. Previously, it showed version of OpenPype that is very confusing in AYON mode. So this now shows AYON version instead. When clicked, it will opene AYON info window, where OpenPype version is now added, for debugging purposes.
+
+
+___
+
+
+
+
+
+AYON Editorial: Hierarchy context have names as keys #6041
+
+Use folder name as keys in `hierarchyContext` and modify hierachy extraction accordingly.
+
+
+___
+
+
+
+
+
+AYON: Convert the createAt value to local timezone #6043
+
+Show correct create time in UIs.
+
+
+___
+
+
+
+### **π Bug fixes**
+
+
+
+Maya: Render creation - fix broken imports #5893
+
+Maya specific imports were moved to specific methods but not in all cases by #5775. This is just quickly restoring functionality without questioning that decision.
+
+
+___
+
+
+
+
+
+Maya: fix crashing model renderset collector #5929
+
+This fix is handling case where model is in some type of render sets but no other connections are made there. Publishing this model would fail with `RuntimeError: Found no items to list the history for.`
+
+
+___
+
+
+
+
+
+Maya: Remove duplicated attributes of MTOA verbosity level #5945
+
+Remove duplicated attributes implementation mentioned in https://github.com/ynput/OpenPype/pull/5931#discussion_r1402175289
+
+
+___
+
+
+
+
+
+Maya: Bug fix Redshift Proxy not being successfully published #5956
+
+Bug fix redshift proxy family not being successfully published due to the error found in integrate.py
+
+
+___
+
+
+
+
+
+Maya: Bug fix load image for texturesetMain #6011
+
+Bug fix load image with file node for texturesetMain
+
+
+___
+
+
+
+
+
+Maya: bug fix the repair function in validate_rendersettings #6021
+
+The following error has been encountered below:
+```
+// pyblish.pyblish.plugin.Action : Finding failed instances..
+// pyblish.pyblish.plugin.Action : Attempting repair for instance: renderLookdevMain ...
+// Error: pyblish.plugin : Traceback (most recent call last):
+// File "C:\Users\lbate\AppData\Local\Ynput\AYON\dependency_packages\ayon_2310271602_windows.zip\dependencies\pyblish\plugin.py", line 527, in __explicit_process
+// runner(*args)
+// File "C:\Users\lbate\AppData\Local\Ynput\AYON\addons\openpype_3.17.7-nightly.6\openpype\pipeline\publish\publish_plugins.py", line 241, in process
+// plugin.repair(instance)
+// File "C:\Users\lbate\AppData\Local\Ynput\AYON\addons\openpype_3.17.7-nightly.6\openpype\hosts\maya\plugins\publish\validate_rendersettings.py", line 395, in repair
+// cmds.setAttr("{}.{}".format(node, prefix_attr),
+// UnboundLocalError: local variable 'node' referenced before assignment
+// Traceback (most recent call last):
+// File "C:\Users\lbate\AppData\Local\Ynput\AYON\dependency_packages\ayon_2310271602_windows.zip\dependencies\pyblish\plugin.py", line 527, in __explicit_process
+// runner(*args)
+// File "C:\Users\lbate\AppData\Local\Ynput\AYON\addons\openpype_3.17.7-nightly.6\openpype\pipeline\publish\publish_plugins.py", line 241, in process
+// plugin.repair(instance)
+// File "C:\Users\lbate\AppData\Local\Ynput\AYON\addons\openpype_3.17.7-nightly.6\openpype\hosts\maya\plugins\publish\validate_rendersettings.py", line 395, in repair
+// cmds.setAttr("{}.{}".format(node, prefix_attr),
+// UnboundLocalError: local variable 'node' referenced before assignment
+```
+This PR is a fix for that
+
+
+___
+
+
+
+
+
+Fusion: Render avoid unhashable type `BlackmagicFusion.PyRemoteObject` error #5672
+
+Fix Fusion 18.6+ support: Avoid issues with Fusion's `BlackmagicFusion.PyRemoteObject` instances being unhashable.
+```python
+Traceback (most recent call last):
+ File "E:\openpype\OpenPype\.venv\lib\site-packages\pyblish\plugin.py", line 527, in __explicit_process
+ runner(*args)
+ File "E:\openpype\OpenPype\openpype\hosts\fusion\plugins\publish\extract_render_local.py", line 61, in process
+ result = self.render(instance)
+ File "E:\openpype\OpenPype\openpype\hosts\fusion\plugins\publish\extract_render_local.py", line 118, in render
+ with enabled_savers(current_comp, savers_to_render):
+ File "C:\Users\User\AppData\Local\Programs\Python\Python39\lib\contextlib.py", line 119, in __enter__
+ return next(self.gen)
+ File "E:\openpype\OpenPype\openpype\hosts\fusion\plugins\publish\extract_render_local.py", line 33, in enabled_savers
+ original_states[saver] = original_state
+TypeError: unhashable type: 'BlackmagicFusion.PyRemoteObject'
+```
+
+
+
+___
+
+
+
+
+
+Nuke: Validate Nuke Write Nodes refactor to use variable `node_value` instead of `value` #5764
+
+Nuke: Validate Nuke Write Nodes refactor to use variable `node_value` instead of `value`The variable `value` only exists as the last variable value in the `for value in values` loop and might not be declared if `values` is an empty iterable.
+
+
+___
+
+
+
+
+
+resolve: fixing loader handles calculation #5863
+
+Resolve was not correctly calculating duration of database related duration.
+
+
+___
+
+
+
+
+
+Chore: Staging mode determination #5895
+
+Resources use `is_staging_enabled` function instead of `is_running_staging` to determine if should use staging icon. And fixed comparison bug in `is_running_staging`.
+
+
+___
+
+
+
+
+
+AYON: Handle staging templates category #5905
+
+Staging anatomy templates category is handled during project templates conversion. The keys are stored into `others` with `"staging_"` prefix.
+
+
+___
+
+
+
+
+
+Max: fix the subset name not changing accordingly after the variant name changes #5911
+
+Resolve #5902
+
+
+___
+
+
+
+
+
+AYON: Loader tool bugs hunt #5915
+
+Fix issues with invalid representation ids in loaded containers and handle missing product type in server database.
+
+
+___
+
+
+
+
+
+Publisher: Bugfixes and enhancements #5924
+
+Small fixes/enhancements in publisher UI.
+
+
+___
+
+
+
+
+
+Maya: Supports for additional Job Info and Plugin Info in deadline submission #5931
+
+This PR is to resolve some of the attributes such as MTOA's `ArnoldVerbose` are not preserved on farm and users can use the project settings to add the attributes back to either job or plugin Info.
+
+
+___
+
+
+
+
+
+Bugfix: Houdini license validator missing families #5934
+
+Adding missing families to Houdini license validator.
+
+
+___
+
+
+
+
+
+TrayPublisher: adding back `asset_doc` variable #5943
+
+Returning variable which had been removed accidentally in previous PR.
+
+
+___
+
+
+
+
+
+Settings: Fix ModulesManager init args #5947
+
+Remove usage of kwargs to create ModulesManager.
+
+
+___
+
+
+
+
+
+Blender: Fix Deadline Frames per task #5949
+
+Fixed a problem with Frames per task setting not being applied when publishing a render.
+
+
+___
+
+
+
+
+
+Testing: Fix is_test_failed #5951
+
+`is_test_failed` is used (exclusively) on module fixtures to determine whether the tests have failed or not. This determines whether to run tear down code like cleaning up the database and temporary files.But in the module scope `request.node.rep_call` is not available, which results in `is_test_failed` always returning `True`, and no tear down code get executed.The solution was taken from; https://github.com/pytest-dev/pytest/issues/5090
+
+
+___
+
+
+
+
+
+Harmony: Fix local rendering #5953
+
+Local rendering was throwing warning about license, but didn't fail per se. It just didn't produce anything.
+
+
+___
+
+
+
+
+
+Testing: hou module should be within class code. #5954
+
+`hou` module should be within the class code else we'll get pyblish errors from needing to skip the plugin.
+
+
+___
+
+
+
+
+
+Maya: Add Label to MayaUSDReferenceLoader #5964
+
+As the create placeholder dialog displays the two distinct loaders with the same name, this PR is to distinguish Maya USD Reference Loaders from the loaders of which inherited from. See the screenshot below:
+
+
+___
+
+
+
+
+
+Max: Bug fix the resolution not being shown correctly in review burnin #5965
+
+The resolution is not being shown correctly in review burnin
+
+
+___
+
+
+
+
+
+AYON: Fix thumbnail integration #5970
+
+Thumbnail integration could cause crash of server if thumbnail id was changed for the same entity id multiple times. Modified the code to avoid that issue.
+
+
+___
+
+
+
+
+
+Photoshop: Updated label in Settings #5980
+
+Replaced wrong label from different plugin.
+
+
+___
+
+
+
+
+
+Photoshop: Fix removed unsupported Path #5996
+
+Path is not json serializable by default, it is not necessary, better model reused.
+
+
+___
+
+
+
+
+
+AYON: Prepare functions for newer ayon-python-api #5997
+
+Newer ayon python api will add new filtering options or change order of existing. Kwargs are used in client code to prevent issues on update.
+
+
+___
+
+
+
+
+
+AYON: Conversion of the new playblast settings in Maya #6000
+
+Conversion of the new playblast settings in Maya
+
+
+___
+
+
+
+
+
+AYON: Bug fix for loading Mesh in Substance Painter as new project not working #6004
+
+Substance Painter in AYON can't load mesh for creating a new project
+
+
+___
+
+
+
+
+
+Deadline: correct webservice couldn't be selected in Ayon #6007
+
+Changed the Setting model to mimic more OP approach as it needs to live together for time being.
+
+
+___
+
+
+
+
+
+AYON tools: Fix refresh thread #6008
+
+Trigger 'refresh_finished' signal out of 'run' method.
+
+
+___
+
+
+
+
+
+Ftrack: multiple reviewable components missing variable #6013
+
+Missing variable in code for editorial publishing in traypublisher.
+
+
+___
+
+
+
+
+
+TVPaint: Expect legacy instances in metadata #6015
+
+Do not expect `"workfileInstances"` constains only new type instance data with `creator_identifier`.
+
+
+___
+
+
+
+
+
+Bugfix: handle missing key in Deadline #6019
+
+This quickly fixes bug introduced by #5420
+
+
+___
+
+
+
+
+
+Revert `extractenvironments` behaviour #6020
+
+This is returning original behaviour of `extractenvironments` command from before #5958 so we restore functionality.
+
+
+___
+
+
+
+
+
+OP-7535 - Fix renaming composition in AE #6025
+
+Removing of `render` instance caused renaming of composition to `dummyComp` which caused issue in publishing in next attempt.This PR stores original composition name(cleaned up for product name creation) and uses it if instance needs to be removed.
+
+
+___
+
+
+
+
+
+Refactor code to skip instance creation for new assets #6029
+
+Publishing effects from hiero during editorial publish is working as expected again.
+
+
+___
+
+
+
+
+
+Refactor code to handle missing "representations" key in instance data #6032
+
+Minor code change for optimisation of thumbnail workflow.
+
+
+___
+
+
+
+
+
+Traypublisher: editorial preserve clip case sensitivity #6036
+
+Keep EDL clip name inheritance with case sensitivity.
+
+
+___
+
+
+
+
+
+Bugfix/add missing houdini settings #6039
+
+add missing settings. now, it looks like this:| Ayon | OpenPype || -- | -- | | | || | |
+
+
+___
+
+
+
+### **π Refactored code**
+
+
+
+Maya: Remove RenderSetup layer observers #5836
+
+Remove RenderSetup layer observers that are not needed since new publisher since Renderlayer Creators manage these themselves on Collect and Save/Update of instances.
+
+
+___
+
+
+
+### **Merged pull requests**
+
+
+
+Tests: Removed render instance #6026
+
+This test was created as simple model and workfile publish, without Deadline rendering. Cleaned up render elements.
+
+
+___
+
+
+
+
+
+Tests: update after thumbnail default change #6040
+
+https://github.com/ynput/OpenPype/pull/5944 changed default state of integration of Thumbnails to NOT integrate. This PR updates automatic tests to follow that.
+
+
+___
+
+
+
+
+
+Houdini: Remove legacy LOPs USD output processors #5861
+
+Remove unused/broken legacy code for Houdini Solaris USD LOPs output processors. The code was originally written in Avalon, against early Houdini 18 betas which had a different API for output processors and thus the current state doesn't even work in recent versions of Houdini.
+
+
+___
+
+
+
+
+
+Chore: Substance Painter Addons for Ayon #5914
+
+Substance Painter Addons for Ayon
+
+
+___
+
+
+
+
+
+Ayon: Updated name of Adobe extension to Ayon #5992
+
+This changes name in menu in Adobe extensions to Ayon.
+
+
+___
+
+
+
+
+
+Chore/houdini update startup log #6003
+
+print `Installing AYON ...` on startup when launching houdini from launcher in ayon mode.also update submenu to `ayon_menu` instead of `openpype_menu`
+
+
+___
+
+
+
+
+
+Revert "Ayon: Updated name of Adobe extension to Ayon" #6010
+
+Reverts ynput/OpenPype#5992
+
+That PR is only applicable to Ayon.
+___
+
+
+
+
+
+Standalone/Tray Publisher: Remove simple Unreal texture publishing #6012
+
+We are removing _simple Unreal Texture publishing_ that was just renaming texture files to fit to Unreal naming conventions but without any additional functionality. We might return this functionality back with better texture publishing system.Related to #5983
+
+
+___
+
+
+
+
+
+Deadline: Bump version because of Settings changes for Deadline #6023
+
+
+___
+
+
+
+
+
+Change ASCII art in the Console based on the server mode #6030
+
+This changes ASCII art in the console based on the AYON/OpenPype mode
+
+
+___
+
+
+
+
+
+
## [3.17.6](https://github.com/ynput/OpenPype/tree/3.17.6)
diff --git a/README.md b/README.md
index ed3e058002..a79b9f2582 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,10 @@ OpenPype
[](https://github.com/pypeclub/pype/actions/workflows/documentation.yml) 
+## Important Notice!
+
+OpenPype as a standalone product has reach end of it's life and this repository is now used as a pipeline core code for [AYON](https://ynput.io/ayon/). You can read more details about the end of life process here https://community.ynput.io/t/openpype-end-of-life-timeline/877
+
Introduction
------------
diff --git a/openpype/cli.py b/openpype/cli.py
index f0fe550a1f..8caa139765 100644
--- a/openpype/cli.py
+++ b/openpype/cli.py
@@ -296,12 +296,15 @@ def run(script):
@click.option("--mongo_url",
help="MongoDB for testing.",
default=None)
+@click.option("--dump_databases",
+ help="Dump all databases to data folder.",
+ default=None)
def runtests(folder, mark, pyargs, test_data_folder, persist, app_variant,
- timeout, setup_only, mongo_url, app_group):
+ timeout, setup_only, mongo_url, app_group, dump_databases):
"""Run all automatic tests after proper initialization via start.py"""
PypeCommands().run_tests(folder, mark, pyargs, test_data_folder,
persist, app_variant, timeout, setup_only,
- mongo_url, app_group)
+ mongo_url, app_group, dump_databases)
@main.command(help="DEPRECATED - run sync server")
diff --git a/openpype/client/server/conversion_utils.py b/openpype/client/server/conversion_utils.py
index 51af99e722..e8d3c4cbe4 100644
--- a/openpype/client/server/conversion_utils.py
+++ b/openpype/client/server/conversion_utils.py
@@ -606,7 +606,7 @@ def convert_v4_version_to_v3(version):
output_data[dst_key] = version[src_key]
if "createdAt" in version:
- created_at = arrow.get(version["createdAt"])
+ created_at = arrow.get(version["createdAt"]).to("local")
output_data["time"] = created_at.strftime("%Y%m%dT%H%M%SZ")
output["data"] = output_data
diff --git a/openpype/client/server/entities.py b/openpype/client/server/entities.py
index 75e58703be..75b5dc2cdd 100644
--- a/openpype/client/server/entities.py
+++ b/openpype/client/server/entities.py
@@ -80,8 +80,8 @@ def _get_subsets(
for subset in con.get_products(
project_name,
- subset_ids,
- subset_names,
+ product_ids=subset_ids,
+ product_names=subset_names,
folder_ids=folder_ids,
names_by_folder_ids=names_by_folder_ids,
active=active,
@@ -113,23 +113,23 @@ def _get_versions(
queried_versions = con.get_versions(
project_name,
- version_ids,
- subset_ids,
- versions,
- hero,
- standard,
- latest,
+ version_ids=version_ids,
+ product_ids=subset_ids,
+ versions=versions,
+ hero=hero,
+ standard=standard,
+ latest=latest,
active=active,
fields=fields
)
- versions = []
+ version_entities = []
hero_versions = []
for version in queried_versions:
if version["version"] < 0:
hero_versions.append(version)
else:
- versions.append(convert_v4_version_to_v3(version))
+ version_entities.append(convert_v4_version_to_v3(version))
if hero_versions:
subset_ids = set()
@@ -159,9 +159,9 @@ def _get_versions(
break
conv_hero = convert_v4_version_to_v3(hero_version)
conv_hero["version_id"] = version_id
- versions.append(conv_hero)
+ version_entities.append(conv_hero)
- return versions
+ return version_entities
def get_asset_by_id(project_name, asset_id, fields=None):
@@ -539,11 +539,11 @@ def get_representations(
representations = con.get_representations(
project_name,
- representation_ids,
- representation_names,
- version_ids,
- names_by_version_ids,
- active,
+ representation_ids=representation_ids,
+ representation_names=representation_names,
+ version_ids=version_ids,
+ names_by_version_ids=names_by_version_ids,
+ active=active,
fields=fields
)
for representation in representations:
diff --git a/openpype/hooks/pre_add_last_workfile_arg.py b/openpype/hooks/pre_add_last_workfile_arg.py
index 1418bc210b..6e255ae82a 100644
--- a/openpype/hooks/pre_add_last_workfile_arg.py
+++ b/openpype/hooks/pre_add_last_workfile_arg.py
@@ -27,6 +27,7 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook):
"tvpaint",
"substancepainter",
"aftereffects",
+ "wrap"
}
launch_types = {LaunchTypes.local}
diff --git a/openpype/hooks/pre_copy_template_workfile.py b/openpype/hooks/pre_copy_template_workfile.py
index 2203ff4396..4d91d83c95 100644
--- a/openpype/hooks/pre_copy_template_workfile.py
+++ b/openpype/hooks/pre_copy_template_workfile.py
@@ -19,7 +19,8 @@ class CopyTemplateWorkfile(PreLaunchHook):
# Before `AddLastWorkfileToLaunchArgs`
order = 0
- app_groups = {"blender", "photoshop", "tvpaint", "aftereffects"}
+ app_groups = {"blender", "photoshop", "tvpaint", "aftereffects",
+ "wrap"}
launch_types = {LaunchTypes.local}
def execute(self):
diff --git a/openpype/hosts/aftereffects/api/README.md b/openpype/hosts/aftereffects/api/README.md
index 790c9f859a..9c4bad3689 100644
--- a/openpype/hosts/aftereffects/api/README.md
+++ b/openpype/hosts/aftereffects/api/README.md
@@ -1,6 +1,6 @@
# AfterEffects Integration
-Requirements: This extension requires use of Javascript engine, which is
+Requirements: This extension requires use of Javascript engine, which is
available since CC 16.0.
Please check your File>Project Settings>Expressions>Expressions Engine
@@ -13,26 +13,28 @@ The After Effects integration requires two components to work; `extension` and `
To install the extension download [Extension Manager Command Line tool (ExManCmd)](https://github.com/Adobe-CEP/Getting-Started-guides/tree/master/Package%20Distribute%20Install#option-2---exmancmd).
```
-ExManCmd /install {path to avalon-core}\avalon\photoshop\extension.zxp
+ExManCmd /install {path to addon}/api/extension.zxp
```
OR
download [Anastasiyβs Extension Manager](https://install.anastasiy.com/)
+`{path to addon}` will be most likely in your AppData (on Windows, in your user data folder in Linux and MacOS.)
+
### Server
The easiest way to get the server and After Effects launch is with:
```
-python -c ^"import avalon.photoshop;avalon.aftereffects.launch(""c:\Program Files\Adobe\Adobe After Effects 2020\Support Files\AfterFX.exe"")^"
+python -c ^"import openpype.hosts.photoshop;openpype.hosts..aftereffects.launch(""c:\Program Files\Adobe\Adobe After Effects 2020\Support Files\AfterFX.exe"")^"
```
`avalon.aftereffects.launch` launches the application and server, and also closes the server when After Effects exists.
## Usage
-The After Effects extension can be found under `Window > Extensions > OpenPype`. Once launched you should be presented with a panel like this:
+The After Effects extension can be found under `Window > Extensions > AYON`. Once launched you should be presented with a panel like this:
-
+
## Developing
@@ -43,8 +45,8 @@ When developing the extension you can load it [unsigned](https://github.com/Adob
When signing the extension you can use this [guide](https://github.com/Adobe-CEP/Getting-Started-guides/tree/master/Package%20Distribute%20Install#package-distribute-install-guide).
```
-ZXPSignCmd -selfSignedCert NA NA Avalon Avalon-After-Effects avalon extension.p12
-ZXPSignCmd -sign {path to avalon-core}\avalon\aftereffects\extension {path to avalon-core}\avalon\aftereffects\extension.zxp extension.p12 avalon
+ZXPSignCmd -selfSignedCert NA NA Ayon Avalon-After-Effects Ayon extension.p12
+ZXPSignCmd -sign {path to addon}/api/extension {path to addon}/api/extension.zxp extension.p12 Ayon
```
### Plugin Examples
@@ -52,14 +54,14 @@ ZXPSignCmd -sign {path to avalon-core}\avalon\aftereffects\extension {path to av
These plugins were made with the [polly config](https://github.com/mindbender-studio/config). To fully integrate and load, you will have to use this config and add `image` to the [integration plugin](https://github.com/mindbender-studio/config/blob/master/polly/plugins/publish/integrate_asset.py).
Expected deployed extension location on default Windows:
-`c:\Program Files (x86)\Common Files\Adobe\CEP\extensions\com.openpype.AE.panel`
+`c:\Program Files (x86)\Common Files\Adobe\CEP\extensions\io.ynput.AE.panel`
For easier debugging of Javascript:
https://community.adobe.com/t5/download-install/adobe-extension-debuger-problem/td-p/10911704?page=1
Add (optional) --enable-blink-features=ShadowDOMV0,CustomElementsV0 when starting Chrome
then localhost:8092
-Or use Visual Studio Code https://medium.com/adobetech/extendscript-debugger-for-visual-studio-code-public-release-a2ff6161fa01
+Or use Visual Studio Code https://medium.com/adobetech/extendscript-debugger-for-visual-studio-code-public-release-a2ff6161fa01
## Resources
- https://javascript-tools-guide.readthedocs.io/introduction/index.html
- https://github.com/Adobe-CEP/Getting-Started-guides
diff --git a/openpype/hosts/aftereffects/api/extension.zxp b/openpype/hosts/aftereffects/api/extension.zxp
index 933dc7dc6c..104a5c9e99 100644
Binary files a/openpype/hosts/aftereffects/api/extension.zxp and b/openpype/hosts/aftereffects/api/extension.zxp differ
diff --git a/openpype/hosts/aftereffects/api/extension/.debug b/openpype/hosts/aftereffects/api/extension/.debug
index b06ec515dd..20a6713ab2 100644
--- a/openpype/hosts/aftereffects/api/extension/.debug
+++ b/openpype/hosts/aftereffects/api/extension/.debug
@@ -1,32 +1,31 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
\ No newline at end of file
diff --git a/openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml b/openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml
index 7329a9e723..cf6ba67f44 100644
--- a/openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml
+++ b/openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml
@@ -1,8 +1,8 @@
-
+
-
+
@@ -38,7 +38,7 @@
-
+
./index.html
@@ -49,7 +49,7 @@
Panel
-
+
200
@@ -66,7 +66,7 @@
- ./icons/iconNormal.png
+ ./icons/ayon_logo.png
./icons/iconRollover.png
./icons/iconDisabled.png
./icons/iconDarkNormal.png
diff --git a/openpype/hosts/aftereffects/api/extension/icons/ayon_logo.png b/openpype/hosts/aftereffects/api/extension/icons/ayon_logo.png
new file mode 100644
index 0000000000..3a96f8e2b4
Binary files /dev/null and b/openpype/hosts/aftereffects/api/extension/icons/ayon_logo.png differ
diff --git a/openpype/hosts/aftereffects/api/panel.png b/openpype/hosts/aftereffects/api/panel.png
new file mode 100644
index 0000000000..d05ed35428
Binary files /dev/null and b/openpype/hosts/aftereffects/api/panel.png differ
diff --git a/openpype/hosts/aftereffects/api/panel_failure.PNG b/openpype/hosts/aftereffects/api/panel_failure.PNG
deleted file mode 100644
index 67afc4e212..0000000000
Binary files a/openpype/hosts/aftereffects/api/panel_failure.PNG and /dev/null differ
diff --git a/openpype/hosts/aftereffects/api/panel_failure.png b/openpype/hosts/aftereffects/api/panel_failure.png
new file mode 100644
index 0000000000..6e52a77d22
Binary files /dev/null and b/openpype/hosts/aftereffects/api/panel_failure.png differ
diff --git a/openpype/hosts/aftereffects/plugins/create/create_render.py b/openpype/hosts/aftereffects/plugins/create/create_render.py
index fbe600ae68..fadfc0c206 100644
--- a/openpype/hosts/aftereffects/plugins/create/create_render.py
+++ b/openpype/hosts/aftereffects/plugins/create/create_render.py
@@ -56,16 +56,15 @@ class RenderCreator(Creator):
use_composition_name = (pre_create_data.get("use_composition_name") or
len(comps) > 1)
for comp in comps:
+ composition_name = re.sub(
+ "[^{}]+".format(SUBSET_NAME_ALLOWED_SYMBOLS),
+ "",
+ comp.name
+ )
if use_composition_name:
if "{composition}" not in subset_name_from_ui.lower():
subset_name_from_ui += "{Composition}"
- composition_name = re.sub(
- "[^{}]+".format(SUBSET_NAME_ALLOWED_SYMBOLS),
- "",
- comp.name
- )
-
dynamic_fill = prepare_template_data({"composition":
composition_name})
subset_name = subset_name_from_ui.format(**dynamic_fill)
@@ -81,6 +80,8 @@ class RenderCreator(Creator):
inst.subset_name))
data["members"] = [comp.id]
+ data["orig_comp_name"] = composition_name
+
new_instance = CreatedInstance(self.family, subset_name, data,
self)
if "farm" in pre_create_data:
@@ -88,7 +89,7 @@ class RenderCreator(Creator):
new_instance.creator_attributes["farm"] = use_farm
review = pre_create_data["mark_for_review"]
- new_instance.creator_attributes["mark_for_review"] = review
+ new_instance. creator_attributes["mark_for_review"] = review
api.get_stub().imprint(new_instance.id,
new_instance.data_to_store())
@@ -150,16 +151,18 @@ class RenderCreator(Creator):
subset_change.new_value)
def remove_instances(self, instances):
+ """Removes metadata and renames to original comp name if available."""
for instance in instances:
self._remove_instance_from_context(instance)
self.host.remove_instance(instance)
- subset = instance.data["subset"]
comp_id = instance.data["members"][0]
comp = api.get_stub().get_item(comp_id)
+ orig_comp_name = instance.data.get("orig_comp_name")
if comp:
- new_comp_name = comp.name.replace(subset, '')
- if not new_comp_name:
+ if orig_comp_name:
+ new_comp_name = orig_comp_name
+ else:
new_comp_name = "dummyCompName"
api.get_stub().rename_item(comp_id,
new_comp_name)
diff --git a/openpype/hosts/aftereffects/plugins/publish/extract_local_render.py b/openpype/hosts/aftereffects/plugins/publish/extract_local_render.py
index bdb48e11f8..b44e986d83 100644
--- a/openpype/hosts/aftereffects/plugins/publish/extract_local_render.py
+++ b/openpype/hosts/aftereffects/plugins/publish/extract_local_render.py
@@ -60,8 +60,9 @@ class ExtractLocalRender(publish.Extractor):
first_repre = not representations
if instance.data["review"] and first_repre:
repre_data["tags"] = ["review"]
- thumbnail_path = os.path.join(staging_dir, files[0])
- instance.data["thumbnailSource"] = thumbnail_path
+ # TODO return back when Extract from source same as regular
+ # thumbnail_path = os.path.join(staging_dir, files[0])
+ # instance.data["thumbnailSource"] = thumbnail_path
representations.append(repre_data)
diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index d564b5ebcb..b437078ad8 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -1,4 +1,4 @@
-import os
+from pathlib import Path
import bpy
@@ -59,7 +59,7 @@ def get_render_product(output_path, name, aov_sep):
instance (pyblish.api.Instance): The instance to publish.
ext (str): The image format to render.
"""
- filepath = os.path.join(output_path, name)
+ filepath = output_path / name.lstrip("/")
render_product = f"{filepath}{aov_sep}beauty.####"
render_product = render_product.replace("\\", "/")
@@ -180,7 +180,7 @@ def set_node_tree(output_path, name, aov_sep, ext, multilayer):
return []
output.file_slots.clear()
- output.base_path = output_path
+ output.base_path = str(output_path)
aov_file_products = []
@@ -191,8 +191,9 @@ def set_node_tree(output_path, name, aov_sep, ext, multilayer):
output.file_slots.new(filepath)
- aov_file_products.append(
- (render_pass.name, os.path.join(output_path, filepath)))
+ filename = str(output_path / filepath.lstrip("/"))
+
+ aov_file_products.append((render_pass.name, filename))
node_input = output.inputs[-1]
@@ -214,12 +215,11 @@ def imprint_render_settings(node, data):
def prepare_rendering(asset_group):
name = asset_group.name
- filepath = bpy.data.filepath
+ filepath = Path(bpy.data.filepath)
assert filepath, "Workfile not saved. Please save the file first."
- file_path = os.path.dirname(filepath)
- file_name = os.path.basename(filepath)
- file_name, _ = os.path.splitext(file_name)
+ dirpath = filepath.parent
+ file_name = Path(filepath.name).stem
project = get_current_project_name()
settings = get_project_settings(project)
@@ -232,7 +232,7 @@ def prepare_rendering(asset_group):
set_render_format(ext, multilayer)
aov_list, custom_passes = set_render_passes(settings)
- output_path = os.path.join(file_path, render_folder, file_name)
+ output_path = Path.joinpath(dirpath, render_folder, file_name)
render_product = get_render_product(output_path, name, aov_sep)
aov_file_product = set_node_tree(
diff --git a/openpype/hosts/blender/plugins/publish/collect_render.py b/openpype/hosts/blender/plugins/publish/collect_render.py
index 00faf85aed..da02f99052 100644
--- a/openpype/hosts/blender/plugins/publish/collect_render.py
+++ b/openpype/hosts/blender/plugins/publish/collect_render.py
@@ -11,12 +11,12 @@ import pyblish.api
class CollectBlenderRender(pyblish.api.InstancePlugin):
- """Gather all publishable render layers from renderSetup."""
+ """Gather all publishable render instances."""
order = pyblish.api.CollectorOrder + 0.01
hosts = ["blender"]
families = ["render"]
- label = "Collect Render Layers"
+ label = "Collect Render"
sync_workfile_version = False
@staticmethod
@@ -78,8 +78,6 @@ class CollectBlenderRender(pyblish.api.InstancePlugin):
assert render_data, "No render data found."
- self.log.debug(f"render_data: {dict(render_data)}")
-
render_product = render_data.get("render_product")
aov_file_product = render_data.get("aov_file_product")
ext = render_data.get("image_format")
@@ -101,7 +99,7 @@ class CollectBlenderRender(pyblish.api.InstancePlugin):
expected_files = expected_beauty | expected_aovs
instance.data.update({
- "family": "render.farm",
+ "families": ["render", "render.farm"],
"frameStart": frame_start,
"frameEnd": frame_end,
"frameStartHandle": frame_handle_start,
@@ -120,5 +118,3 @@ class CollectBlenderRender(pyblish.api.InstancePlugin):
"colorspaceView": "ACES 1.0 SDR-video",
"renderProducts": colorspace.ARenderProduct(),
})
-
- self.log.debug(f"data: {instance.data}")
diff --git a/openpype/hosts/blender/plugins/publish/extract_layout.py b/openpype/hosts/blender/plugins/publish/extract_layout.py
index 41c6b0912c..3e8978c8d3 100644
--- a/openpype/hosts/blender/plugins/publish/extract_layout.py
+++ b/openpype/hosts/blender/plugins/publish/extract_layout.py
@@ -14,7 +14,7 @@ from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY
class ExtractLayout(publish.Extractor, publish.OptionalPyblishPluginMixin):
"""Extract a layout."""
- label = "Extract Layout"
+ label = "Extract Layout (JSON)"
hosts = ["blender"]
families = ["layout"]
optional = True
diff --git a/openpype/hosts/blender/plugins/publish/extract_thumbnail.py b/openpype/hosts/blender/plugins/publish/extract_thumbnail.py
index e8a9c68dd1..e593e0de27 100644
--- a/openpype/hosts/blender/plugins/publish/extract_thumbnail.py
+++ b/openpype/hosts/blender/plugins/publish/extract_thumbnail.py
@@ -26,6 +26,10 @@ class ExtractThumbnail(publish.Extractor):
def process(self, instance):
self.log.debug("Extracting capture..")
+ if instance.data.get("thumbnailSource"):
+ self.log.debug("Thumbnail source found, skipping...")
+ return
+
stagingdir = self.staging_dir(instance)
asset_name = instance.data["assetEntity"]["name"]
subset = instance.data["subset"]
diff --git a/openpype/hosts/blender/plugins/publish/increment_workfile_version.py b/openpype/hosts/blender/plugins/publish/increment_workfile_version.py
index 7e33fd53fa..9f8d20aedc 100644
--- a/openpype/hosts/blender/plugins/publish/increment_workfile_version.py
+++ b/openpype/hosts/blender/plugins/publish/increment_workfile_version.py
@@ -14,7 +14,7 @@ class IncrementWorkfileVersion(
optional = True
hosts = ["blender"]
families = ["animation", "model", "rig", "action", "layout", "blendScene",
- "pointcache", "render"]
+ "pointcache", "render.farm"]
def process(self, context):
if not self.is_active(context.data):
diff --git a/openpype/hosts/blender/plugins/publish/validate_deadline_publish.py b/openpype/hosts/blender/plugins/publish/validate_deadline_publish.py
index d8826adc9c..bb243f08cc 100644
--- a/openpype/hosts/blender/plugins/publish/validate_deadline_publish.py
+++ b/openpype/hosts/blender/plugins/publish/validate_deadline_publish.py
@@ -19,7 +19,7 @@ class ValidateDeadlinePublish(pyblish.api.InstancePlugin,
"""
order = ValidateContentsOrder
- families = ["render.farm"]
+ families = ["render"]
hosts = ["blender"]
label = "Validate Render Output for Deadline"
optional = True
diff --git a/openpype/hosts/fusion/api/menu.py b/openpype/hosts/fusion/api/menu.py
index 50250a6656..0b9ad1a43b 100644
--- a/openpype/hosts/fusion/api/menu.py
+++ b/openpype/hosts/fusion/api/menu.py
@@ -1,3 +1,4 @@
+import os
import sys
from qtpy import QtWidgets, QtCore, QtGui
@@ -18,6 +19,10 @@ from openpype.resources import get_openpype_icon_filepath
from .pipeline import FusionEventHandler
from .pulse import FusionPulse
+
+MENU_LABEL = os.environ["AVALON_LABEL"]
+
+
self = sys.modules[__name__]
self.menu = None
@@ -26,7 +31,7 @@ class OpenPypeMenu(QtWidgets.QWidget):
def __init__(self, *args, **kwargs):
super(OpenPypeMenu, self).__init__(*args, **kwargs)
- self.setObjectName("OpenPypeMenu")
+ self.setObjectName(f"{MENU_LABEL}Menu")
icon_path = get_openpype_icon_filepath()
icon = QtGui.QIcon(icon_path)
@@ -41,7 +46,7 @@ class OpenPypeMenu(QtWidgets.QWidget):
| QtCore.Qt.WindowStaysOnTopHint
)
self.render_mode_widget = None
- self.setWindowTitle("OpenPype")
+ self.setWindowTitle(MENU_LABEL)
asset_label = QtWidgets.QLabel("Context", self)
asset_label.setStyleSheet(
diff --git a/openpype/hosts/fusion/deploy/MenuScripts/openpype_menu.py b/openpype/hosts/fusion/deploy/MenuScripts/launch_menu.py
similarity index 100%
rename from openpype/hosts/fusion/deploy/MenuScripts/openpype_menu.py
rename to openpype/hosts/fusion/deploy/MenuScripts/launch_menu.py
diff --git a/openpype/hosts/fusion/deploy/ayon/Config/menu.fu b/openpype/hosts/fusion/deploy/ayon/Config/menu.fu
new file mode 100644
index 0000000000..c968a1bb3d
--- /dev/null
+++ b/openpype/hosts/fusion/deploy/ayon/Config/menu.fu
@@ -0,0 +1,60 @@
+{
+ Action
+ {
+ ID = "AYON_Menu",
+ Category = "AYON",
+ Name = "AYON Menu",
+
+ Targets =
+ {
+ Composition =
+ {
+ Execute = _Lua [=[
+ local scriptPath = app:MapPath("AYON:../MenuScripts/launch_menu.py")
+ if bmd.fileexists(scriptPath) == false then
+ print("[AYON Error] Can't run file: " .. scriptPath)
+ else
+ target:RunScript(scriptPath)
+ end
+ ]=],
+ },
+ },
+ },
+ Action
+ {
+ ID = "AYON_Install_PySide2",
+ Category = "AYON",
+ Name = "Install PySide2",
+
+ Targets =
+ {
+ Composition =
+ {
+ Execute = _Lua [=[
+ local scriptPath = app:MapPath("AYON:../MenuScripts/install_pyside2.py")
+ if bmd.fileexists(scriptPath) == false then
+ print("[AYON Error] Can't run file: " .. scriptPath)
+ else
+ target:RunScript(scriptPath)
+ end
+ ]=],
+ },
+ },
+ },
+ Menus
+ {
+ Target = "ChildFrame",
+
+ Before "Help"
+ {
+ Sub "AYON"
+ {
+ "AYON_Menu{}",
+ "_",
+ Sub "Admin" {
+ "AYON_Install_PySide2{}"
+ }
+ }
+ },
+ },
+}
diff --git a/openpype/hosts/fusion/deploy/ayon/fusion_shared.prefs b/openpype/hosts/fusion/deploy/ayon/fusion_shared.prefs
new file mode 100644
index 0000000000..9c67af7db9
--- /dev/null
+++ b/openpype/hosts/fusion/deploy/ayon/fusion_shared.prefs
@@ -0,0 +1,19 @@
+{
+Locked = true,
+Global = {
+ Paths = {
+ Map = {
+ ["AYON:"] = "$(OPENPYPE_FUSION)/deploy/ayon",
+ ["Config:"] = "UserPaths:Config;AYON:Config",
+ ["Scripts:"] = "UserPaths:Scripts;Reactor:System/Scripts",
+ },
+ },
+ Script = {
+ PythonVersion = 3,
+ Python3Forced = true
+ },
+ UserInterface = {
+ Language = "en_US"
+ },
+ },
+}
diff --git a/openpype/hosts/fusion/deploy/Config/openpype_menu.fu b/openpype/hosts/fusion/deploy/openpype/Config/menu.fu
similarity index 87%
rename from openpype/hosts/fusion/deploy/Config/openpype_menu.fu
rename to openpype/hosts/fusion/deploy/openpype/Config/menu.fu
index 8b8d448259..85134d2c62 100644
--- a/openpype/hosts/fusion/deploy/Config/openpype_menu.fu
+++ b/openpype/hosts/fusion/deploy/openpype/Config/menu.fu
@@ -10,7 +10,7 @@
Composition =
{
Execute = _Lua [=[
- local scriptPath = app:MapPath("OpenPype:MenuScripts/openpype_menu.py")
+ local scriptPath = app:MapPath("OpenPype:../MenuScripts/launch_menu.py")
if bmd.fileexists(scriptPath) == false then
print("[OpenPype Error] Can't run file: " .. scriptPath)
else
@@ -31,7 +31,7 @@
Composition =
{
Execute = _Lua [=[
- local scriptPath = app:MapPath("OpenPype:MenuScripts/install_pyside2.py")
+ local scriptPath = app:MapPath("OpenPype:../MenuScripts/install_pyside2.py")
if bmd.fileexists(scriptPath) == false then
print("[OpenPype Error] Can't run file: " .. scriptPath)
else
diff --git a/openpype/hosts/fusion/deploy/fusion_shared.prefs b/openpype/hosts/fusion/deploy/openpype/fusion_shared.prefs
similarity index 83%
rename from openpype/hosts/fusion/deploy/fusion_shared.prefs
rename to openpype/hosts/fusion/deploy/openpype/fusion_shared.prefs
index 93b08aa886..0035a38990 100644
--- a/openpype/hosts/fusion/deploy/fusion_shared.prefs
+++ b/openpype/hosts/fusion/deploy/openpype/fusion_shared.prefs
@@ -3,7 +3,7 @@ Locked = true,
Global = {
Paths = {
Map = {
- ["OpenPype:"] = "$(OPENPYPE_FUSION)/deploy",
+ ["OpenPype:"] = "$(OPENPYPE_FUSION)/deploy/openpype",
["Config:"] = "UserPaths:Config;OpenPype:Config",
["Scripts:"] = "UserPaths:Scripts;Reactor:System/Scripts",
},
diff --git a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py
index 66b0f803aa..59053ba62a 100644
--- a/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py
+++ b/openpype/hosts/fusion/hooks/pre_fusion_profile_hook.py
@@ -2,6 +2,7 @@ import os
import shutil
import platform
from pathlib import Path
+from openpype import AYON_SERVER_ENABLED
from openpype.hosts.fusion import (
FUSION_HOST_DIR,
FUSION_VERSIONS_DICT,
@@ -161,6 +162,13 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook):
# profile directory variables to customize Fusion
# to define where it can read custom scripts and tools from
master_prefs_variable = f"FUSION{profile_version}_MasterPrefs"
- master_prefs = Path(FUSION_HOST_DIR, "deploy", "fusion_shared.prefs")
+
+ if AYON_SERVER_ENABLED:
+ master_prefs = Path(
+ FUSION_HOST_DIR, "deploy", "ayon", "fusion_shared.prefs")
+ else:
+ master_prefs = Path(
+ FUSION_HOST_DIR, "deploy", "openpype", "fusion_shared.prefs")
+
self.log.info(f"Setting {master_prefs_variable}: {master_prefs}")
self.launch_context.env[master_prefs_variable] = str(master_prefs)
diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py
index ecf36abdd2..5870828b41 100644
--- a/openpype/hosts/fusion/plugins/create/create_saver.py
+++ b/openpype/hosts/fusion/plugins/create/create_saver.py
@@ -14,7 +14,7 @@ from openpype.pipeline import (
legacy_io,
Creator as NewCreator,
CreatedInstance,
- Anatomy
+ Anatomy,
)
@@ -27,28 +27,21 @@ class CreateSaver(NewCreator):
description = "Fusion Saver to generate image sequence"
icon = "fa5.eye"
- instance_attributes = [
- "reviewable"
- ]
+ instance_attributes = ["reviewable"]
+ image_format = "exr"
# TODO: This should be renamed together with Nuke so it is aligned
temp_rendering_path_template = (
- "{workdir}/renders/fusion/{subset}/{subset}.{frame}.{ext}")
+ "{workdir}/renders/fusion/{subset}/{subset}.{frame}.{ext}"
+ )
def create(self, subset_name, instance_data, pre_create_data):
- self.pass_pre_attributes_to_instance(
- instance_data,
- pre_create_data
+ self.pass_pre_attributes_to_instance(instance_data, pre_create_data)
+
+ instance_data.update(
+ {"id": "pyblish.avalon.instance", "subset": subset_name}
)
- instance_data.update({
- "id": "pyblish.avalon.instance",
- "subset": subset_name
- })
-
- # TODO: Add pre_create attributes to choose file format?
- file_format = "OpenEXRFormat"
-
comp = get_current_comp()
with comp_lock_and_undo_chunk(comp):
args = (-32768, -32768) # Magical position numbers
@@ -56,19 +49,6 @@ class CreateSaver(NewCreator):
self._update_tool_with_data(saver, data=instance_data)
- saver["OutputFormat"] = file_format
-
- # Check file format settings are available
- if saver[file_format] is None:
- raise RuntimeError(
- f"File format is not set to {file_format}, this is a bug"
- )
-
- # Set file format attributes
- saver[file_format]["Depth"] = 0 # Auto | float16 | float32
- # TODO Is this needed?
- saver[file_format]["SaveAlpha"] = 1
-
# Register the CreatedInstance
instance = CreatedInstance(
family=self.family,
@@ -140,8 +120,15 @@ class CreateSaver(NewCreator):
return
original_subset = tool.GetData("openpype.subset")
+ original_format = tool.GetData(
+ "openpype.creator_attributes.image_format"
+ )
+
subset = data["subset"]
- if original_subset != subset:
+ if (
+ original_subset != subset
+ or original_format != data["creator_attributes"]["image_format"]
+ ):
self._configure_saver_tool(data, tool, subset)
def _configure_saver_tool(self, data, tool, subset):
@@ -151,17 +138,17 @@ class CreateSaver(NewCreator):
anatomy = Anatomy()
frame_padding = anatomy.templates["frame_padding"]
+ # get output format
+ ext = data["creator_attributes"]["image_format"]
+
# Subset change detected
workdir = os.path.normpath(legacy_io.Session["AVALON_WORKDIR"])
- formatting_data.update({
- "workdir": workdir,
- "frame": "0" * frame_padding,
- "ext": "exr"
- })
+ formatting_data.update(
+ {"workdir": workdir, "frame": "0" * frame_padding, "ext": ext}
+ )
# build file path to render
- filepath = self.temp_rendering_path_template.format(
- **formatting_data)
+ filepath = self.temp_rendering_path_template.format(**formatting_data)
comp = get_current_comp()
tool["Clip"] = comp.ReverseMapPath(os.path.normpath(filepath))
@@ -201,7 +188,8 @@ class CreateSaver(NewCreator):
attr_defs = [
self._get_render_target_enum(),
self._get_reviewable_bool(),
- self._get_frame_range_enum()
+ self._get_frame_range_enum(),
+ self._get_image_format_enum(),
]
return attr_defs
@@ -209,11 +197,7 @@ class CreateSaver(NewCreator):
"""Settings for publish page"""
return self.get_pre_create_attr_defs()
- def pass_pre_attributes_to_instance(
- self,
- instance_data,
- pre_create_data
- ):
+ def pass_pre_attributes_to_instance(self, instance_data, pre_create_data):
creator_attrs = instance_data["creator_attributes"] = {}
for pass_key in pre_create_data.keys():
creator_attrs[pass_key] = pre_create_data[pass_key]
@@ -236,13 +220,13 @@ class CreateSaver(NewCreator):
frame_range_options = {
"asset_db": "Current asset context",
"render_range": "From render in/out",
- "comp_range": "From composition timeline"
+ "comp_range": "From composition timeline",
}
return EnumDef(
"frame_range_source",
items=frame_range_options,
- label="Frame range source"
+ label="Frame range source",
)
def _get_reviewable_bool(self):
@@ -252,20 +236,33 @@ class CreateSaver(NewCreator):
label="Review",
)
+ def _get_image_format_enum(self):
+ image_format_options = ["exr", "tga", "tif", "png", "jpg"]
+ return EnumDef(
+ "image_format",
+ items=image_format_options,
+ default=self.image_format,
+ label="Output Image Format",
+ )
+
def apply_settings(self, project_settings):
"""Method called on initialization of plugin to apply settings."""
# plugin settings
- plugin_settings = (
- project_settings["fusion"]["create"][self.__class__.__name__]
- )
+ plugin_settings = project_settings["fusion"]["create"][
+ self.__class__.__name__
+ ]
# individual attributes
self.instance_attributes = plugin_settings.get(
- "instance_attributes") or self.instance_attributes
- self.default_variants = plugin_settings.get(
- "default_variants") or self.default_variants
- self.temp_rendering_path_template = (
- plugin_settings.get("temp_rendering_path_template")
- or self.temp_rendering_path_template
+ "instance_attributes", self.instance_attributes
+ )
+ self.default_variants = plugin_settings.get(
+ "default_variants", self.default_variants
+ )
+ self.temp_rendering_path_template = plugin_settings.get(
+ "temp_rendering_path_template", self.temp_rendering_path_template
+ )
+ self.image_format = plugin_settings.get(
+ "image_format", self.image_format
)
diff --git a/openpype/hosts/fusion/plugins/publish/extract_render_local.py b/openpype/hosts/fusion/plugins/publish/extract_render_local.py
index 25c101cf00..068df22c06 100644
--- a/openpype/hosts/fusion/plugins/publish/extract_render_local.py
+++ b/openpype/hosts/fusion/plugins/publish/extract_render_local.py
@@ -25,20 +25,24 @@ def enabled_savers(comp, savers):
"""
passthrough_key = "TOOLB_PassThrough"
original_states = {}
- enabled_save_names = {saver.Name for saver in savers}
+ enabled_saver_names = {saver.Name for saver in savers}
+
+ all_savers = comp.GetToolList(False, "Saver").values()
+ savers_by_name = {saver.Name: saver for saver in all_savers}
+
try:
- all_savers = comp.GetToolList(False, "Saver").values()
for saver in all_savers:
original_state = saver.GetAttrs()[passthrough_key]
- original_states[saver] = original_state
+ original_states[saver.Name] = original_state
# The passthrough state we want to set (passthrough != enabled)
- state = saver.Name not in enabled_save_names
+ state = saver.Name not in enabled_saver_names
if state != original_state:
saver.SetAttrs({passthrough_key: state})
yield
finally:
- for saver, original_state in original_states.items():
+ for saver_name, original_state in original_states.items():
+ saver = savers_by_name[saver_name]
saver.SetAttrs({"TOOLB_PassThrough": original_state})
@@ -142,11 +146,15 @@ class FusionRenderLocal(
staging_dir = os.path.dirname(path)
+ files = [os.path.basename(f) for f in expected_files]
+ if len(expected_files) == 1:
+ files = files[0]
+
repre = {
"name": ext[1:],
"ext": ext[1:],
"frameStart": f"%0{padding}d" % start,
- "files": [os.path.basename(f) for f in expected_files],
+ "files": files,
"stagingDir": staging_dir,
}
diff --git a/openpype/hosts/harmony/api/TB_sceneOpened.js b/openpype/hosts/harmony/api/TB_sceneOpened.js
index a284a6ec5c..48daf094dd 100644
--- a/openpype/hosts/harmony/api/TB_sceneOpened.js
+++ b/openpype/hosts/harmony/api/TB_sceneOpened.js
@@ -13,7 +13,7 @@ var LD_OPENHARMONY_PATH = System.getenv('LIB_OPENHARMONY_PATH');
LD_OPENHARMONY_PATH = LD_OPENHARMONY_PATH + '/openHarmony.js';
LD_OPENHARMONY_PATH = LD_OPENHARMONY_PATH.replace(/\\/g, "/");
include(LD_OPENHARMONY_PATH);
-this.__proto__['$'] = $;
+//this.__proto__['$'] = $;
function Client() {
var self = this;
diff --git a/openpype/hosts/harmony/plugins/publish/extract_render.py b/openpype/hosts/harmony/plugins/publish/extract_render.py
index 5825d95a4a..96a375716b 100644
--- a/openpype/hosts/harmony/plugins/publish/extract_render.py
+++ b/openpype/hosts/harmony/plugins/publish/extract_render.py
@@ -59,8 +59,8 @@ class ExtractRender(pyblish.api.InstancePlugin):
args = [application_path, "-batch",
"-frames", str(frame_start), str(frame_end),
- "-scene", scene_path]
- self.log.info(f"running [ {application_path} {' '.join(args)}")
+ scene_path]
+ self.log.info(f"running: {' '.join(args)}")
proc = subprocess.Popen(
args,
stdout=subprocess.PIPE,
diff --git a/openpype/hosts/hiero/api/menu.py b/openpype/hosts/hiero/api/menu.py
index 9967e9c875..ca611570cc 100644
--- a/openpype/hosts/hiero/api/menu.py
+++ b/openpype/hosts/hiero/api/menu.py
@@ -95,18 +95,18 @@ def menu_install():
menu.addSeparator()
- publish_action = menu.addAction("Publish...")
- publish_action.setIcon(QtGui.QIcon("icons:Output.png"))
- publish_action.triggered.connect(
- lambda *args: publish(hiero.ui.mainWindow())
- )
-
creator_action = menu.addAction("Create...")
creator_action.setIcon(QtGui.QIcon("icons:CopyRectangle.png"))
creator_action.triggered.connect(
lambda: host_tools.show_creator(parent=main_window)
)
+ publish_action = menu.addAction("Publish...")
+ publish_action.setIcon(QtGui.QIcon("icons:Output.png"))
+ publish_action.triggered.connect(
+ lambda *args: publish(hiero.ui.mainWindow())
+ )
+
loader_action = menu.addAction("Load...")
loader_action.setIcon(QtGui.QIcon("icons:CopyRectangle.png"))
loader_action.triggered.connect(
diff --git a/openpype/hosts/houdini/api/lib.py b/openpype/hosts/houdini/api/lib.py
index 513735092c..614052431f 100644
--- a/openpype/hosts/houdini/api/lib.py
+++ b/openpype/hosts/houdini/api/lib.py
@@ -121,8 +121,8 @@ def get_id_required_nodes():
return list(nodes)
-def get_output_parameter(node):
- """Return the render output parameter name of the given node
+def get_export_parameter(node):
+ """Return the export output parameter of the given node
Example:
root = hou.node("/obj")
@@ -137,13 +137,70 @@ def get_output_parameter(node):
hou.Parm
"""
+ node_type = node.type().description()
- node_type = node.type().name()
- if node_type == "geometry":
+ # Ensures the proper Take is selected for each ROP to retrieve the correct
+ # ifd
+ try:
+ rop_take = hou.takes.findTake(node.parm("take").eval())
+ if rop_take is not None:
+ hou.takes.setCurrentTake(rop_take)
+ except AttributeError:
+ # hou object doesn't always have the 'takes' attribute
+ pass
+
+ if node_type == "Mantra" and node.parm("soho_outputmode").eval():
+ return node.parm("soho_diskfile")
+ elif node_type == "Alfred":
+ return node.parm("alf_diskfile")
+ elif (node_type == "RenderMan" or node_type == "RenderMan RIS"):
+ pre_ris22 = node.parm("rib_outputmode") and \
+ node.parm("rib_outputmode").eval()
+ ris22 = node.parm("diskfile") and node.parm("diskfile").eval()
+ if pre_ris22 or ris22:
+ return node.parm("soho_diskfile")
+ elif node_type == "Redshift" and node.parm("RS_archive_enable").eval():
+ return node.parm("RS_archive_file")
+ elif node_type == "Wedge" and node.parm("driver").eval():
+ return get_export_parameter(node.node(node.parm("driver").eval()))
+ elif node_type == "Arnold":
+ return node.parm("ar_ass_file")
+ elif node_type == "Alembic" and node.parm("use_sop_path").eval():
+ return node.parm("sop_path")
+ elif node_type == "Shotgun Mantra" and node.parm("soho_outputmode").eval():
+ return node.parm("sgtk_soho_diskfile")
+ elif node_type == "Shotgun Alembic" and node.parm("use_sop_path").eval():
+ return node.parm("sop_path")
+ elif node.type().nameWithCategory() == "Driver/vray_renderer":
+ return node.parm("render_export_filepath")
+
+ raise TypeError("Node type '%s' not supported" % node_type)
+
+
+def get_output_parameter(node):
+ """Return the render output parameter of the given node
+
+ Example:
+ root = hou.node("/obj")
+ my_alembic_node = root.createNode("alembic")
+ get_output_parameter(my_alembic_node)
+ # Result: "output"
+
+ Args:
+ node(hou.Node): node instance
+
+ Returns:
+ hou.Parm
+
+ """
+ node_type = node.type().description()
+ category = node.type().category().name()
+
+ # Figure out which type of node is being rendered
+ if node_type == "Geometry" or node_type == "Filmbox FBX" or \
+ (node_type == "ROP Output Driver" and category == "Sop"):
return node.parm("sopoutput")
- elif node_type == "alembic":
- return node.parm("filename")
- elif node_type == "comp":
+ elif node_type == "Composite":
return node.parm("copoutput")
elif node_type == "opengl":
return node.parm("picture")
@@ -155,6 +212,15 @@ def get_output_parameter(node):
elif node_type == "ifd":
if node.evalParm("soho_outputmode"):
return node.parm("soho_diskfile")
+ elif node_type == "Octane":
+ return node.parm("HO_img_fileName")
+ elif node_type == "Fetch":
+ inner_node = node.node(node.parm("source").eval())
+ if inner_node:
+ return get_output_parameter(inner_node)
+ elif node.type().nameWithCategory() == "Driver/vray_renderer":
+ return node.parm("SettingsOutput_img_file_path")
+
raise TypeError("Node type '%s' not supported" % node_type)
diff --git a/openpype/hosts/houdini/plugins/create/create_arnold_rop.py b/openpype/hosts/houdini/plugins/create/create_arnold_rop.py
index b58c377a20..85c4f0f5ff 100644
--- a/openpype/hosts/houdini/plugins/create/create_arnold_rop.py
+++ b/openpype/hosts/houdini/plugins/create/create_arnold_rop.py
@@ -13,6 +13,9 @@ class CreateArnoldRop(plugin.HoudiniCreator):
# Default extension
ext = "exr"
+ # Default to split export and render jobs
+ export_job = True
+
def create(self, subset_name, instance_data, pre_create_data):
import hou
@@ -48,6 +51,15 @@ class CreateArnoldRop(plugin.HoudiniCreator):
"ar_exr_half_precision": 1 # half precision
}
+ if pre_create_data.get("export_job"):
+ ass_filepath = \
+ "{export_dir}{subset_name}/{subset_name}.$F4.ass".format(
+ export_dir=hou.text.expandString("$HIP/pyblish/ass/"),
+ subset_name=subset_name,
+ )
+ parms["ar_ass_export_enable"] = 1
+ parms["ar_ass_file"] = ass_filepath
+
instance_node.setParms(parms)
# Lock any parameters in this list
@@ -66,6 +78,9 @@ class CreateArnoldRop(plugin.HoudiniCreator):
BoolDef("farm",
label="Submitting to Farm",
default=True),
+ BoolDef("export_job",
+ label="Split export and render jobs",
+ default=self.export_job),
EnumDef("image_format",
image_format_enum,
default=self.ext,
diff --git a/openpype/hosts/houdini/plugins/create/create_mantra_rop.py b/openpype/hosts/houdini/plugins/create/create_mantra_rop.py
index d2f0e735a8..8ecfbea802 100644
--- a/openpype/hosts/houdini/plugins/create/create_mantra_rop.py
+++ b/openpype/hosts/houdini/plugins/create/create_mantra_rop.py
@@ -12,6 +12,9 @@ class CreateMantraROP(plugin.HoudiniCreator):
family = "mantra_rop"
icon = "magic"
+ # Default to split export and render jobs
+ export_job = True
+
def create(self, subset_name, instance_data, pre_create_data):
import hou # noqa
@@ -44,6 +47,15 @@ class CreateMantraROP(plugin.HoudiniCreator):
"vm_picture": filepath,
}
+ if pre_create_data.get("export_job"):
+ ifd_filepath = \
+ "{export_dir}{subset_name}/{subset_name}.$F4.ifd".format(
+ export_dir=hou.text.expandString("$HIP/pyblish/ifd/"),
+ subset_name=subset_name,
+ )
+ parms["soho_outputmode"] = 1
+ parms["soho_diskfile"] = ifd_filepath
+
if self.selected_nodes:
# If camera found in selection
# we will use as render camera
@@ -78,6 +90,9 @@ class CreateMantraROP(plugin.HoudiniCreator):
BoolDef("farm",
label="Submitting to Farm",
default=True),
+ BoolDef("export_job",
+ label="Split export and render jobs",
+ default=self.export_job),
EnumDef("image_format",
image_format_enum,
default="exr",
diff --git a/openpype/hosts/houdini/plugins/create/create_vray_rop.py b/openpype/hosts/houdini/plugins/create/create_vray_rop.py
index 793a544fdf..272b57b548 100644
--- a/openpype/hosts/houdini/plugins/create/create_vray_rop.py
+++ b/openpype/hosts/houdini/plugins/create/create_vray_rop.py
@@ -16,6 +16,9 @@ class CreateVrayROP(plugin.HoudiniCreator):
icon = "magic"
ext = "exr"
+ # Default to split export and render jobs
+ export_job = True
+
def create(self, subset_name, instance_data, pre_create_data):
instance_data.pop("active", None)
@@ -52,6 +55,17 @@ class CreateVrayROP(plugin.HoudiniCreator):
"SettingsEXR_bits_per_channel": "16" # half precision
}
+ if pre_create_data.get("export_job"):
+ scene_filepath = \
+ "{export_dir}{subset_name}/{subset_name}.$F4.vrscene".format(
+ export_dir=hou.text.expandString("$HIP/pyblish/vrscene/"),
+ subset_name=subset_name,
+ )
+ # Setting render_export_mode to "2" because that's for
+ # "Export only" ("1" is for "Export & Render")
+ parms["render_export_mode"] = "2"
+ parms["render_export_filepath"] = scene_filepath
+
if self.selected_nodes:
# set up the render camera from the selected node
camera = None
@@ -140,6 +154,9 @@ class CreateVrayROP(plugin.HoudiniCreator):
BoolDef("farm",
label="Submitting to Farm",
default=True),
+ BoolDef("export_job",
+ label="Split export and render jobs",
+ default=self.export_job),
EnumDef("image_format",
image_format_enum,
default=self.ext,
diff --git a/openpype/hosts/houdini/plugins/publish/collect_arnold_rop.py b/openpype/hosts/houdini/plugins/publish/collect_arnold_rop.py
index d95f763826..c7da8397dc 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_arnold_rop.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_arnold_rop.py
@@ -40,6 +40,25 @@ class CollectArnoldROPRenderProducts(pyblish.api.InstancePlugin):
default_prefix = evalParmNoFrame(rop, "ar_picture")
render_products = []
+ # Store whether we are splitting the render job (export + render)
+ export_job = bool(rop.parm("ar_ass_export_enable").eval())
+ instance.data["exportJob"] = export_job
+ export_prefix = None
+ export_products = []
+ if export_job:
+ export_prefix = evalParmNoFrame(
+ rop, "ar_ass_file", pad_character="0"
+ )
+ beauty_export_product = self.get_render_product_name(
+ prefix=export_prefix,
+ suffix=None)
+ export_products.append(beauty_export_product)
+ self.log.debug(
+ "Found export product: {}".format(beauty_export_product)
+ )
+ instance.data["ifdFile"] = beauty_export_product
+ instance.data["exportFiles"] = list(export_products)
+
# Default beauty AOV
beauty_product = self.get_render_product_name(prefix=default_prefix,
suffix=None)
diff --git a/openpype/hosts/houdini/plugins/publish/collect_chunk_size.py b/openpype/hosts/houdini/plugins/publish/collect_chunk_size.py
index 1c867e930a..f8cd4089e2 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_chunk_size.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_chunk_size.py
@@ -14,18 +14,13 @@ class CollectChunkSize(pyblish.api.InstancePlugin,
hosts = ["houdini"]
targets = ["local", "remote"]
label = "Collect Chunk Size"
- chunkSize = 999999
+ chunk_size = 999999
def process(self, instance):
# need to get the chunk size info from the setting
attr_values = self.get_attr_values_from_data(instance.data)
instance.data["chunkSize"] = attr_values.get("chunkSize")
- @classmethod
- def apply_settings(cls, project_settings):
- project_setting = project_settings["houdini"]["publish"]["CollectChunkSize"] # noqa
- cls.chunkSize = project_setting["chunk_size"]
-
@classmethod
def get_attribute_defs(cls):
return [
@@ -33,7 +28,6 @@ class CollectChunkSize(pyblish.api.InstancePlugin,
minimum=1,
maximum=999999,
decimals=0,
- default=cls.chunkSize,
+ default=cls.chunk_size,
label="Frame Per Task")
-
]
diff --git a/openpype/hosts/houdini/plugins/publish/collect_mantra_rop.py b/openpype/hosts/houdini/plugins/publish/collect_mantra_rop.py
index a3e7927807..bc71576174 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_mantra_rop.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_mantra_rop.py
@@ -44,6 +44,25 @@ class CollectMantraROPRenderProducts(pyblish.api.InstancePlugin):
default_prefix = evalParmNoFrame(rop, "vm_picture")
render_products = []
+ # Store whether we are splitting the render job (export + render)
+ export_job = bool(rop.parm("soho_outputmode").eval())
+ instance.data["exportJob"] = export_job
+ export_prefix = None
+ export_products = []
+ if export_job:
+ export_prefix = evalParmNoFrame(
+ rop, "soho_diskfile", pad_character="0"
+ )
+ beauty_export_product = self.get_render_product_name(
+ prefix=export_prefix,
+ suffix=None)
+ export_products.append(beauty_export_product)
+ self.log.debug(
+ "Found export product: {}".format(beauty_export_product)
+ )
+ instance.data["ifdFile"] = beauty_export_product
+ instance.data["exportFiles"] = list(export_products)
+
# Default beauty AOV
beauty_product = self.get_render_product_name(
prefix=default_prefix, suffix=None
diff --git a/openpype/hosts/houdini/plugins/publish/collect_vray_rop.py b/openpype/hosts/houdini/plugins/publish/collect_vray_rop.py
index 64de2079cd..a1f4554726 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_vray_rop.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_vray_rop.py
@@ -45,7 +45,26 @@ class CollectVrayROPRenderProducts(pyblish.api.InstancePlugin):
render_products = []
# TODO: add render elements if render element
- beauty_product = self.get_beauty_render_product(default_prefix)
+ # Store whether we are splitting the render job in an export + render
+ export_job = rop.parm("render_export_mode").eval() == "2"
+ instance.data["exportJob"] = export_job
+ export_prefix = None
+ export_products = []
+ if export_job:
+ export_prefix = evalParmNoFrame(
+ rop, "render_export_filepath", pad_character="0"
+ )
+ beauty_export_product = self.get_render_product_name(
+ prefix=export_prefix,
+ suffix=None)
+ export_products.append(beauty_export_product)
+ self.log.debug(
+ "Found export product: {}".format(beauty_export_product)
+ )
+ instance.data["ifdFile"] = beauty_export_product
+ instance.data["exportFiles"] = list(export_products)
+
+ beauty_product = self.get_render_product_name(default_prefix)
render_products.append(beauty_product)
files_by_aov = {
"RGB Color": self.generate_expected_files(instance,
@@ -79,7 +98,7 @@ class CollectVrayROPRenderProducts(pyblish.api.InstancePlugin):
instance.data["colorspaceDisplay"] = colorspace_data["display"]
instance.data["colorspaceView"] = colorspace_data["view"]
- def get_beauty_render_product(self, prefix, suffix=""):
+ def get_render_product_name(self, prefix, suffix=""):
"""Return the beauty output filename if render element enabled
"""
# Remove aov suffix from the product: `prefix.aov_suffix` -> `prefix`
diff --git a/openpype/hosts/houdini/startup/python2.7libs/pythonrc.py b/openpype/hosts/houdini/startup/python2.7libs/pythonrc.py
index 683ea6721c..0b92fc2706 100644
--- a/openpype/hosts/houdini/startup/python2.7libs/pythonrc.py
+++ b/openpype/hosts/houdini/startup/python2.7libs/pythonrc.py
@@ -2,10 +2,12 @@
"""OpenPype startup script."""
from openpype.pipeline import install_host
from openpype.hosts.houdini.api import HoudiniHost
+from openpype import AYON_SERVER_ENABLED
def main():
- print("Installing OpenPype ...")
+ print("Installing {} ...".format(
+ "AYON" if AYON_SERVER_ENABLED else "OpenPype"))
install_host(HoudiniHost())
diff --git a/openpype/hosts/houdini/startup/python3.10libs/pythonrc.py b/openpype/hosts/houdini/startup/python3.10libs/pythonrc.py
index 683ea6721c..0b92fc2706 100644
--- a/openpype/hosts/houdini/startup/python3.10libs/pythonrc.py
+++ b/openpype/hosts/houdini/startup/python3.10libs/pythonrc.py
@@ -2,10 +2,12 @@
"""OpenPype startup script."""
from openpype.pipeline import install_host
from openpype.hosts.houdini.api import HoudiniHost
+from openpype import AYON_SERVER_ENABLED
def main():
- print("Installing OpenPype ...")
+ print("Installing {} ...".format(
+ "AYON" if AYON_SERVER_ENABLED else "OpenPype"))
install_host(HoudiniHost())
diff --git a/openpype/hosts/houdini/startup/python3.7libs/pythonrc.py b/openpype/hosts/houdini/startup/python3.7libs/pythonrc.py
index 683ea6721c..0b92fc2706 100644
--- a/openpype/hosts/houdini/startup/python3.7libs/pythonrc.py
+++ b/openpype/hosts/houdini/startup/python3.7libs/pythonrc.py
@@ -2,10 +2,12 @@
"""OpenPype startup script."""
from openpype.pipeline import install_host
from openpype.hosts.houdini.api import HoudiniHost
+from openpype import AYON_SERVER_ENABLED
def main():
- print("Installing OpenPype ...")
+ print("Installing {} ...".format(
+ "AYON" if AYON_SERVER_ENABLED else "OpenPype"))
install_host(HoudiniHost())
diff --git a/openpype/hosts/houdini/startup/python3.9libs/pythonrc.py b/openpype/hosts/houdini/startup/python3.9libs/pythonrc.py
index 683ea6721c..0b92fc2706 100644
--- a/openpype/hosts/houdini/startup/python3.9libs/pythonrc.py
+++ b/openpype/hosts/houdini/startup/python3.9libs/pythonrc.py
@@ -2,10 +2,12 @@
"""OpenPype startup script."""
from openpype.pipeline import install_host
from openpype.hosts.houdini.api import HoudiniHost
+from openpype import AYON_SERVER_ENABLED
def main():
- print("Installing OpenPype ...")
+ print("Installing {} ...".format(
+ "AYON" if AYON_SERVER_ENABLED else "OpenPype"))
install_host(HoudiniHost())
diff --git a/openpype/hosts/max/api/lib.py b/openpype/hosts/max/api/lib.py
index 298084a4e8..8531233bb2 100644
--- a/openpype/hosts/max/api/lib.py
+++ b/openpype/hosts/max/api/lib.py
@@ -511,3 +511,20 @@ def render_resolution(width, height):
finally:
rt.renderWidth = current_renderWidth
rt.renderHeight = current_renderHeight
+
+
+@contextlib.contextmanager
+def suspended_refresh():
+ """Suspended refresh for scene and modify panel redraw.
+ """
+ if is_headless():
+ yield
+ return
+ rt.disableSceneRedraw()
+ rt.suspendEditing()
+ try:
+ yield
+
+ finally:
+ rt.enableSceneRedraw()
+ rt.resumeEditing()
diff --git a/openpype/hosts/max/api/menu.py b/openpype/hosts/max/api/menu.py
index 364f9cd5c5..caaa3e3730 100644
--- a/openpype/hosts/max/api/menu.py
+++ b/openpype/hosts/max/api/menu.py
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
-"""3dsmax menu definition of OpenPype."""
+"""3dsmax menu definition of AYON."""
+import os
from qtpy import QtWidgets, QtCore
from pymxs import runtime as rt
@@ -8,7 +9,7 @@ from openpype.hosts.max.api import lib
class OpenPypeMenu(object):
- """Object representing OpenPype menu.
+ """Object representing OpenPype/AYON menu.
This is using "hack" to inject itself before "Help" menu of 3dsmax.
For some reason `postLoadingMenus` event doesn't fire, and main menu
@@ -50,17 +51,17 @@ class OpenPypeMenu(object):
return list(self.main_widget.findChildren(QtWidgets.QMenuBar))[0]
def get_or_create_openpype_menu(
- self, name: str = "&OpenPype",
+ self, name: str = "&Openpype",
before: str = "&Help") -> QtWidgets.QAction:
- """Create OpenPype menu.
+ """Create AYON menu.
Args:
- name (str, Optional): OpenPypep menu name.
+ name (str, Optional): AYON menu name.
before (str, Optional): Name of the 3dsmax main menu item to
- add OpenPype menu before.
+ add AYON menu before.
Returns:
- QtWidgets.QAction: OpenPype menu action.
+ QtWidgets.QAction: AYON menu action.
"""
if self.menu is not None:
@@ -77,15 +78,15 @@ class OpenPypeMenu(object):
if before in item.title():
help_action = item.menuAction()
-
- op_menu = QtWidgets.QMenu("&OpenPype")
+ tab_menu_label = os.environ.get("AVALON_LABEL") or "AYON"
+ op_menu = QtWidgets.QMenu("&{}".format(tab_menu_label))
menu_bar.insertMenu(help_action, op_menu)
self.menu = op_menu
return op_menu
def build_openpype_menu(self) -> QtWidgets.QAction:
- """Build items in OpenPype menu."""
+ """Build items in AYON menu."""
openpype_menu = self.get_or_create_openpype_menu()
load_action = QtWidgets.QAction("Load...", openpype_menu)
load_action.triggered.connect(self.load_callback)
diff --git a/openpype/hosts/max/api/pipeline.py b/openpype/hosts/max/api/pipeline.py
index e46c4cabe7..d0ae854dc8 100644
--- a/openpype/hosts/max/api/pipeline.py
+++ b/openpype/hosts/max/api/pipeline.py
@@ -175,7 +175,7 @@ def containerise(name: str, nodes: list, context,
def load_custom_attribute_data():
- """Re-loading the Openpype/AYON custom parameter built by the creator
+ """Re-loading the AYON custom parameter built by the creator
Returns:
attribute: re-loading the custom OP attributes set in Maxscript
@@ -213,7 +213,7 @@ def import_custom_attribute_data(container: str, selections: list):
def update_custom_attribute_data(container: str, selections: list):
- """Updating the Openpype/AYON custom parameter built by the creator
+ """Updating the AYON custom parameter built by the creator
Args:
container (str): target container which adds custom attributes
diff --git a/openpype/hosts/max/api/preview_animation.py b/openpype/hosts/max/api/preview_animation.py
index 6c7b8eaa80..74579b165f 100644
--- a/openpype/hosts/max/api/preview_animation.py
+++ b/openpype/hosts/max/api/preview_animation.py
@@ -198,8 +198,8 @@ def _render_preview_animation_max_pre_2024(
res_width, res_height, filename=filepath
)
dib = rt.gw.getViewportDib()
- dib_width = rt.renderWidth
- dib_height = rt.renderHeight
+ dib_width = float(dib.width)
+ dib_height = float(dib.height)
# aspect ratio
viewportRatio = dib_width / dib_height
renderRatio = float(res_width / res_height)
diff --git a/openpype/hosts/max/plugins/publish/extract_pointcache.py b/openpype/hosts/max/plugins/publish/extract_alembic.py
similarity index 56%
rename from openpype/hosts/max/plugins/publish/extract_pointcache.py
rename to openpype/hosts/max/plugins/publish/extract_alembic.py
index f6a8500c08..24e0121a61 100644
--- a/openpype/hosts/max/plugins/publish/extract_pointcache.py
+++ b/openpype/hosts/max/plugins/publish/extract_alembic.py
@@ -39,45 +39,41 @@ Note:
"""
import os
import pyblish.api
-from openpype.pipeline import publish
+from openpype.pipeline import publish, OptionalPyblishPluginMixin
from pymxs import runtime as rt
from openpype.hosts.max.api import maintained_selection
+from openpype.hosts.max.api.lib import suspended_refresh
+from openpype.lib import BoolDef
-class ExtractAlembic(publish.Extractor):
+class ExtractAlembic(publish.Extractor,
+ OptionalPyblishPluginMixin):
order = pyblish.api.ExtractorOrder
label = "Extract Pointcache"
hosts = ["max"]
families = ["pointcache"]
+ optional = True
def process(self, instance):
- start = instance.data["frameStartHandle"]
- end = instance.data["frameEndHandle"]
-
- self.log.debug("Extracting pointcache ...")
+ if not self.is_active(instance.data):
+ return
parent_dir = self.staging_dir(instance)
file_name = "{name}.abc".format(**instance.data)
path = os.path.join(parent_dir, file_name)
- # We run the render
- self.log.info("Writing alembic '%s' to '%s'" % (file_name, parent_dir))
-
- rt.AlembicExport.ArchiveType = rt.name("ogawa")
- rt.AlembicExport.CoordinateSystem = rt.name("maya")
- rt.AlembicExport.StartFrame = start
- rt.AlembicExport.EndFrame = end
-
- with maintained_selection():
- # select and export
- node_list = instance.data["members"]
- rt.Select(node_list)
- rt.exportFile(
- path,
- rt.name("noPrompt"),
- selectedOnly=True,
- using=rt.AlembicExport,
- )
+ with suspended_refresh():
+ self._set_abc_attributes(instance)
+ with maintained_selection():
+ # select and export
+ node_list = instance.data["members"]
+ rt.Select(node_list)
+ rt.exportFile(
+ path,
+ rt.name("noPrompt"),
+ selectedOnly=True,
+ using=rt.AlembicExport,
+ )
if "representations" not in instance.data:
instance.data["representations"] = []
@@ -89,3 +85,51 @@ class ExtractAlembic(publish.Extractor):
"stagingDir": parent_dir,
}
instance.data["representations"].append(representation)
+
+ def _set_abc_attributes(self, instance):
+ start = instance.data["frameStartHandle"]
+ end = instance.data["frameEndHandle"]
+ attr_values = self.get_attr_values_from_data(instance.data)
+ custom_attrs = attr_values.get("custom_attrs", False)
+ if not custom_attrs:
+ self.log.debug(
+ "No Custom Attributes included in this abc export...")
+ rt.AlembicExport.ArchiveType = rt.Name("ogawa")
+ rt.AlembicExport.CoordinateSystem = rt.Name("maya")
+ rt.AlembicExport.StartFrame = start
+ rt.AlembicExport.EndFrame = end
+ rt.AlembicExport.CustomAttributes = custom_attrs
+
+ @classmethod
+ def get_attribute_defs(cls):
+ return [
+ BoolDef("custom_attrs",
+ label="Custom Attributes",
+ default=False),
+ ]
+
+
+class ExtractCameraAlembic(ExtractAlembic):
+ """Extract Camera with AlembicExport."""
+
+ label = "Extract Alembic Camera"
+ families = ["camera"]
+
+
+class ExtractModel(ExtractAlembic):
+ """Extract Geometry in Alembic Format"""
+ label = "Extract Geometry (Alembic)"
+ families = ["model"]
+
+ def _set_abc_attributes(self, instance):
+ attr_values = self.get_attr_values_from_data(instance.data)
+ custom_attrs = attr_values.get("custom_attrs", False)
+ if not custom_attrs:
+ self.log.debug(
+ "No Custom Attributes included in this abc export...")
+ rt.AlembicExport.ArchiveType = rt.name("ogawa")
+ rt.AlembicExport.CoordinateSystem = rt.name("maya")
+ rt.AlembicExport.CustomAttributes = custom_attrs
+ rt.AlembicExport.UVs = True
+ rt.AlembicExport.VertexColors = True
+ rt.AlembicExport.PreserveInstances = True
diff --git a/openpype/hosts/max/plugins/publish/extract_camera_abc.py b/openpype/hosts/max/plugins/publish/extract_camera_abc.py
deleted file mode 100644
index a42f27be6e..0000000000
--- a/openpype/hosts/max/plugins/publish/extract_camera_abc.py
+++ /dev/null
@@ -1,64 +0,0 @@
-import os
-
-import pyblish.api
-from pymxs import runtime as rt
-
-from openpype.hosts.max.api import maintained_selection
-from openpype.pipeline import OptionalPyblishPluginMixin, publish
-
-
-class ExtractCameraAlembic(publish.Extractor, OptionalPyblishPluginMixin):
- """Extract Camera with AlembicExport."""
-
- order = pyblish.api.ExtractorOrder - 0.1
- label = "Extract Alembic Camera"
- hosts = ["max"]
- families = ["camera"]
- optional = True
-
- def process(self, instance):
- if not self.is_active(instance.data):
- return
- start = instance.data["frameStartHandle"]
- end = instance.data["frameEndHandle"]
-
- self.log.info("Extracting Camera ...")
-
- stagingdir = self.staging_dir(instance)
- filename = "{name}.abc".format(**instance.data)
- path = os.path.join(stagingdir, filename)
-
- # We run the render
- self.log.info(f"Writing alembic '{filename}' to '{stagingdir}'")
-
- rt.AlembicExport.ArchiveType = rt.Name("ogawa")
- rt.AlembicExport.CoordinateSystem = rt.Name("maya")
- rt.AlembicExport.StartFrame = start
- rt.AlembicExport.EndFrame = end
- rt.AlembicExport.CustomAttributes = True
-
- with maintained_selection():
- # select and export
- node_list = instance.data["members"]
- rt.Select(node_list)
- rt.ExportFile(
- path,
- rt.Name("noPrompt"),
- selectedOnly=True,
- using=rt.AlembicExport,
- )
-
- self.log.info("Performing Extraction ...")
- if "representations" not in instance.data:
- instance.data["representations"] = []
-
- representation = {
- "name": "abc",
- "ext": "abc",
- "files": filename,
- "stagingDir": stagingdir,
- "frameStart": start,
- "frameEnd": end,
- }
- instance.data["representations"].append(representation)
- self.log.info(f"Extracted instance '{instance.name}' to: {path}")
diff --git a/openpype/hosts/max/plugins/publish/extract_camera_fbx.py b/openpype/hosts/max/plugins/publish/extract_camera_fbx.py
index 537c88eb4d..4b5631b05f 100644
--- a/openpype/hosts/max/plugins/publish/extract_camera_fbx.py
+++ b/openpype/hosts/max/plugins/publish/extract_camera_fbx.py
@@ -20,13 +20,10 @@ class ExtractCameraFbx(publish.Extractor, OptionalPyblishPluginMixin):
if not self.is_active(instance.data):
return
- self.log.debug("Extracting Camera ...")
stagingdir = self.staging_dir(instance)
filename = "{name}.fbx".format(**instance.data)
filepath = os.path.join(stagingdir, filename)
- self.log.info(f"Writing fbx file '{filename}' to '{filepath}'")
-
rt.FBXExporterSetParam("Animation", True)
rt.FBXExporterSetParam("Cameras", True)
rt.FBXExporterSetParam("AxisConversionMethod", "Animation")
diff --git a/openpype/hosts/max/plugins/publish/extract_max_scene_raw.py b/openpype/hosts/max/plugins/publish/extract_max_scene_raw.py
index a7a889c587..791cc65fcd 100644
--- a/openpype/hosts/max/plugins/publish/extract_max_scene_raw.py
+++ b/openpype/hosts/max/plugins/publish/extract_max_scene_raw.py
@@ -26,7 +26,6 @@ class ExtractMaxSceneRaw(publish.Extractor, OptionalPyblishPluginMixin):
filename = "{name}.max".format(**instance.data)
max_path = os.path.join(stagingdir, filename)
- self.log.info("Writing max file '%s' to '%s'" % (filename, max_path))
if "representations" not in instance.data:
instance.data["representations"] = []
diff --git a/openpype/hosts/max/plugins/publish/extract_model.py b/openpype/hosts/max/plugins/publish/extract_model.py
deleted file mode 100644
index 38f4848c5e..0000000000
--- a/openpype/hosts/max/plugins/publish/extract_model.py
+++ /dev/null
@@ -1,63 +0,0 @@
-import os
-import pyblish.api
-from openpype.pipeline import publish, OptionalPyblishPluginMixin
-from pymxs import runtime as rt
-from openpype.hosts.max.api import maintained_selection
-
-
-class ExtractModel(publish.Extractor, OptionalPyblishPluginMixin):
- """
- Extract Geometry in Alembic Format
- """
-
- order = pyblish.api.ExtractorOrder - 0.1
- label = "Extract Geometry (Alembic)"
- hosts = ["max"]
- families = ["model"]
- optional = True
-
- def process(self, instance):
- if not self.is_active(instance.data):
- return
-
- self.log.debug("Extracting Geometry ...")
-
- stagingdir = self.staging_dir(instance)
- filename = "{name}.abc".format(**instance.data)
- filepath = os.path.join(stagingdir, filename)
-
- # We run the render
- self.log.info("Writing alembic '%s' to '%s'" % (filename, stagingdir))
-
- rt.AlembicExport.ArchiveType = rt.name("ogawa")
- rt.AlembicExport.CoordinateSystem = rt.name("maya")
- rt.AlembicExport.CustomAttributes = True
- rt.AlembicExport.UVs = True
- rt.AlembicExport.VertexColors = True
- rt.AlembicExport.PreserveInstances = True
-
- with maintained_selection():
- # select and export
- node_list = instance.data["members"]
- rt.Select(node_list)
- rt.exportFile(
- filepath,
- rt.name("noPrompt"),
- selectedOnly=True,
- using=rt.AlembicExport,
- )
-
- self.log.info("Performing Extraction ...")
- if "representations" not in instance.data:
- instance.data["representations"] = []
-
- representation = {
- "name": "abc",
- "ext": "abc",
- "files": filename,
- "stagingDir": stagingdir,
- }
- instance.data["representations"].append(representation)
- self.log.info(
- "Extracted instance '%s' to: %s" % (instance.name, filepath)
- )
diff --git a/openpype/hosts/max/plugins/publish/extract_model_fbx.py b/openpype/hosts/max/plugins/publish/extract_model_fbx.py
index fd48ed5007..6c42fd5364 100644
--- a/openpype/hosts/max/plugins/publish/extract_model_fbx.py
+++ b/openpype/hosts/max/plugins/publish/extract_model_fbx.py
@@ -20,12 +20,9 @@ class ExtractModelFbx(publish.Extractor, OptionalPyblishPluginMixin):
if not self.is_active(instance.data):
return
- self.log.debug("Extracting Geometry ...")
-
stagingdir = self.staging_dir(instance)
filename = "{name}.fbx".format(**instance.data)
filepath = os.path.join(stagingdir, filename)
- self.log.info("Writing FBX '%s' to '%s'" % (filepath, stagingdir))
rt.FBXExporterSetParam("Animation", False)
rt.FBXExporterSetParam("Cameras", False)
@@ -46,7 +43,6 @@ class ExtractModelFbx(publish.Extractor, OptionalPyblishPluginMixin):
using=rt.FBXEXP,
)
- self.log.info("Performing Extraction ...")
if "representations" not in instance.data:
instance.data["representations"] = []
diff --git a/openpype/hosts/max/plugins/publish/extract_model_obj.py b/openpype/hosts/max/plugins/publish/extract_model_obj.py
index a5d9ad6597..8464353164 100644
--- a/openpype/hosts/max/plugins/publish/extract_model_obj.py
+++ b/openpype/hosts/max/plugins/publish/extract_model_obj.py
@@ -3,6 +3,7 @@ import pyblish.api
from openpype.pipeline import publish, OptionalPyblishPluginMixin
from pymxs import runtime as rt
from openpype.hosts.max.api import maintained_selection
+from openpype.hosts.max.api.lib import suspended_refresh
from openpype.pipeline.publish import KnownPublishError
@@ -21,25 +22,21 @@ class ExtractModelObj(publish.Extractor, OptionalPyblishPluginMixin):
if not self.is_active(instance.data):
return
- self.log.debug("Extracting Geometry ...")
-
stagingdir = self.staging_dir(instance)
filename = "{name}.obj".format(**instance.data)
filepath = os.path.join(stagingdir, filename)
- self.log.info("Writing OBJ '%s' to '%s'" % (filepath, stagingdir))
-
- self.log.info("Performing Extraction ...")
- with maintained_selection():
- # select and export
- node_list = instance.data["members"]
- rt.Select(node_list)
- rt.exportFile(
- filepath,
- rt.name("noPrompt"),
- selectedOnly=True,
- using=rt.ObjExp,
- )
+ with suspended_refresh():
+ with maintained_selection():
+ # select and export
+ node_list = instance.data["members"]
+ rt.Select(node_list)
+ rt.exportFile(
+ filepath,
+ rt.name("noPrompt"),
+ selectedOnly=True,
+ using=rt.ObjExp,
+ )
if not os.path.exists(filepath):
raise KnownPublishError(
"File {} wasn't produced by 3ds max, please check the logs.")
diff --git a/openpype/hosts/max/plugins/publish/validate_resolution_setting.py b/openpype/hosts/max/plugins/publish/validate_resolution_setting.py
index 7d91a7b991..1c4b05c556 100644
--- a/openpype/hosts/max/plugins/publish/validate_resolution_setting.py
+++ b/openpype/hosts/max/plugins/publish/validate_resolution_setting.py
@@ -1,9 +1,12 @@
import pyblish.api
+from pymxs import runtime as rt
from openpype.pipeline import (
- PublishValidationError,
OptionalPyblishPluginMixin
)
-from pymxs import runtime as rt
+from openpype.pipeline.publish import (
+ RepairAction,
+ PublishValidationError
+)
from openpype.hosts.max.api.lib import reset_scene_resolution
@@ -16,6 +19,7 @@ class ValidateResolutionSetting(pyblish.api.InstancePlugin,
hosts = ["max"]
label = "Validate Resolution Setting"
optional = True
+ actions = [RepairAction]
def process(self, instance):
if not self.is_active(instance.data):
diff --git a/openpype/hosts/maya/plugins/inventory/import_modelrender.py b/openpype/hosts/maya/plugins/inventory/import_modelrender.py
index 4db8c4f2f6..3b30695146 100644
--- a/openpype/hosts/maya/plugins/inventory/import_modelrender.py
+++ b/openpype/hosts/maya/plugins/inventory/import_modelrender.py
@@ -33,7 +33,7 @@ class ImportModelRender(InventoryAction):
)
def process(self, containers):
- from maya import cmds
+ from maya import cmds # noqa: F401
project_name = get_current_project_name()
for container in containers:
@@ -66,7 +66,7 @@ class ImportModelRender(InventoryAction):
None
"""
- from maya import cmds
+ from maya import cmds # noqa: F401
project_name = get_current_project_name()
repre_docs = get_representations(
@@ -85,12 +85,7 @@ class ImportModelRender(InventoryAction):
if scene_type_regex.fullmatch(repre_name):
look_repres.append(repre_doc)
- # QUESTION should we care if there is more then one look
- # representation? (since it's based on regex match)
- look_repre = None
- if look_repres:
- look_repre = look_repres[0]
-
+ look_repre = look_repres[0] if look_repres else None
# QUESTION shouldn't be json representation validated too?
if not look_repre:
print("No model render sets for this model version..")
diff --git a/openpype/hosts/maya/plugins/load/load_image.py b/openpype/hosts/maya/plugins/load/load_image.py
index 3b1f5442ce..27c9ec7118 100644
--- a/openpype/hosts/maya/plugins/load/load_image.py
+++ b/openpype/hosts/maya/plugins/load/load_image.py
@@ -9,7 +9,7 @@ from openpype.pipeline import (
)
from openpype.pipeline.load.utils import get_representation_path_from_context
from openpype.pipeline.colorspace import (
- get_imageio_colorspace_from_filepath,
+ get_imageio_file_rules_colorspace_from_filepath,
get_imageio_config,
get_imageio_file_rules
)
@@ -285,10 +285,10 @@ class FileNodeLoader(load.LoaderPlugin):
)
path = get_representation_path_from_context(context)
- colorspace = get_imageio_colorspace_from_filepath(
- path=path,
- host_name=host_name,
- project_name=project_name,
+ colorspace = get_imageio_file_rules_colorspace_from_filepath(
+ path,
+ host_name,
+ project_name,
config_data=config_data,
file_rules=file_rules,
project_settings=project_settings
diff --git a/openpype/hosts/maya/plugins/load/load_reference.py b/openpype/hosts/maya/plugins/load/load_reference.py
index 0d7f08d3c3..a4ab6c79c1 100644
--- a/openpype/hosts/maya/plugins/load/load_reference.py
+++ b/openpype/hosts/maya/plugins/load/load_reference.py
@@ -265,6 +265,7 @@ class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
class MayaUSDReferenceLoader(ReferenceLoader):
"""Reference USD file to native Maya nodes using MayaUSDImport reference"""
+ label = "Reference Maya USD"
families = ["usd"]
representations = ["usd"]
extensions = {"usd", "usda", "usdc"}
diff --git a/openpype/hosts/maya/plugins/publish/collect_look.py b/openpype/hosts/maya/plugins/publish/collect_look.py
index db042963c6..72682f7800 100644
--- a/openpype/hosts/maya/plugins/publish/collect_look.py
+++ b/openpype/hosts/maya/plugins/publish/collect_look.py
@@ -45,11 +45,23 @@ FILE_NODES = {
"PxrTexture": "filename"
}
+RENDER_SET_TYPES = [
+ "VRayDisplacement",
+ "VRayLightMesh",
+ "VRayObjectProperties",
+ "RedshiftObjectId",
+ "RedshiftMeshParameters",
+]
+
# Keep only node types that actually exist
all_node_types = set(cmds.allNodeTypes())
for node_type in list(FILE_NODES.keys()):
if node_type not in all_node_types:
FILE_NODES.pop(node_type)
+
+for node_type in RENDER_SET_TYPES:
+ if node_type not in all_node_types:
+ RENDER_SET_TYPES.remove(node_type)
del all_node_types
# Cache pixar dependency node types so we can perform a type lookup against it
@@ -69,9 +81,7 @@ def get_attributes(dictionary, attr, node=None):
else:
val = dictionary.get(attr, [])
- if not isinstance(val, list):
- return [val]
- return val
+ return val if isinstance(val, list) else [val]
def get_look_attrs(node):
@@ -106,7 +116,7 @@ def get_look_attrs(node):
def node_uses_image_sequence(node, node_path):
- # type: (str) -> bool
+ # type: (str, str) -> bool
"""Return whether file node uses an image sequence or single image.
Determine if a node uses an image sequence or just a single image,
@@ -114,6 +124,7 @@ def node_uses_image_sequence(node, node_path):
Args:
node (str): Name of the Maya node
+ node_path (str): The file path of the node
Returns:
bool: True if node uses an image sequence
@@ -247,7 +258,7 @@ def get_file_node_files(node):
# For sequences get all files and filter to only existing files
result = []
- for index, path in enumerate(paths):
+ for path in paths:
if node_uses_image_sequence(node, path):
glob_pattern = seq_to_glob(path)
result.extend(glob.glob(glob_pattern))
@@ -358,6 +369,7 @@ class CollectLook(pyblish.api.InstancePlugin):
for attr in shader_attrs:
if cmds.attributeQuery(attr, node=look, exists=True):
existing_attrs.append("{}.{}".format(look, attr))
+
materials = cmds.listConnections(existing_attrs,
source=True,
destination=False) or []
@@ -367,30 +379,32 @@ class CollectLook(pyblish.api.InstancePlugin):
self.log.debug("Found the following sets:\n{}".format(look_sets))
# Get the entire node chain of the look sets
# history = cmds.listHistory(look_sets, allConnections=True)
- history = cmds.listHistory(materials, allConnections=True)
+ # if materials list is empty, listHistory() will crash with
+ # RuntimeError
+ history = set()
+ if materials:
+ history = set(
+ cmds.listHistory(materials, allConnections=True))
# Since we retrieved history only of the connected materials
# connected to the look sets above we now add direct history
# for some of the look sets directly
# handling render attribute sets
- render_set_types = [
- "VRayDisplacement",
- "VRayLightMesh",
- "VRayObjectProperties",
- "RedshiftObjectId",
- "RedshiftMeshParameters",
- ]
- render_sets = cmds.ls(look_sets, type=render_set_types)
- if render_sets:
- history.extend(
- cmds.listHistory(render_sets,
- future=False,
- pruneDagObjects=True)
- or []
- )
+
+ # Maya (at least 2024) crashes with Warning when render set type
+ # isn't available. cmds.ls() will return empty list
+ if RENDER_SET_TYPES:
+ render_sets = cmds.ls(look_sets, type=RENDER_SET_TYPES)
+ if render_sets:
+ history.update(
+ cmds.listHistory(render_sets,
+ future=False,
+ pruneDagObjects=True)
+ or []
+ )
# Ensure unique entries only
- history = list(set(history))
+ history = list(history)
files = cmds.ls(history,
# It's important only node types are passed that
diff --git a/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py b/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py
index 0109f6ebd5..c3edf5f1c3 100644
--- a/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py
+++ b/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py
@@ -3,60 +3,76 @@ from maya import cmds
import pyblish.api
from openpype.pipeline.publish import (
ValidateContentsOrder,
+ RepairContextAction,
PublishValidationError
)
-class ValidateLookDefaultShadersConnections(pyblish.api.InstancePlugin):
+class ValidateLookDefaultShadersConnections(pyblish.api.ContextPlugin):
"""Validate default shaders in the scene have their default connections.
- For example the lambert1 could potentially be disconnected from the
- initialShadingGroup. As such it's not lambert1 that will be identified
- as the default shader which can have unpredictable results.
+ For example the standardSurface1 or lambert1 (maya 2023 and before) could
+ potentially be disconnected from the initialShadingGroup. As such it's not
+ lambert1 that will be identified as the default shader which can have
+ unpredictable results.
To fix the default connections need to be made again. See the logs for
more details on which connections are missing.
"""
- order = ValidateContentsOrder
+ order = pyblish.api.ValidatorOrder - 0.4999
families = ['look']
hosts = ['maya']
label = 'Look Default Shader Connections'
+ actions = [RepairContextAction]
# The default connections to check
- DEFAULTS = [("initialShadingGroup.surfaceShader", "lambert1"),
- ("initialParticleSE.surfaceShader", "lambert1"),
- ("initialParticleSE.volumeShader", "particleCloud1")
- ]
+ DEFAULTS = {
+ "initialShadingGroup.surfaceShader": ["standardSurface1.outColor",
+ "lambert1.outColor"],
+ "initialParticleSE.surfaceShader": ["standardSurface1.outColor",
+ "lambert1.outColor"],
+ "initialParticleSE.volumeShader": ["particleCloud1.outColor"]
+ }
- def process(self, instance):
+ def process(self, context):
- # Ensure check is run only once. We don't use ContextPlugin because
- # of a bug where the ContextPlugin will always be visible. Even when
- # the family is not present in an instance.
- key = "__validate_look_default_shaders_connections_checked"
- context = instance.context
- is_run = context.data.get(key, False)
- if is_run:
- return
- else:
- context.data[key] = True
+ if self.get_invalid():
+ raise PublishValidationError(
+ "Default shaders in your scene do not have their "
+ "default shader connections. Please repair them to continue."
+ )
+
+ @classmethod
+ def get_invalid(cls):
# Process as usual
invalid = list()
- for plug, input_node in self.DEFAULTS:
+ for plug, valid_inputs in cls.DEFAULTS.items():
inputs = cmds.listConnections(plug,
source=True,
- destination=False) or None
-
- if not inputs or inputs[0] != input_node:
- self.log.error("{0} is not connected to {1}. "
- "This can result in unexpected behavior. "
- "Please reconnect to continue.".format(
- plug,
- input_node))
+ destination=False,
+ plugs=True) or None
+ if not inputs or inputs[0] not in valid_inputs:
+ cls.log.error(
+ "{0} is not connected to {1}. This can result in "
+ "unexpected behavior. Please reconnect to continue."
+ "".format(plug, " or ".join(valid_inputs))
+ )
invalid.append(plug)
- if invalid:
- raise PublishValidationError("Invalid connections.")
+ return invalid
+
+ @classmethod
+ def repair(cls, context):
+ invalid = cls.get_invalid()
+ for plug in invalid:
+ valid_inputs = cls.DEFAULTS[plug]
+ for valid_input in valid_inputs:
+ if cmds.objExists(valid_input):
+ cls.log.info(
+ "Connecting {} -> {}".format(valid_input, plug)
+ )
+ cmds.connectAttr(valid_input, plug, force=True)
+ break
diff --git a/openpype/hosts/maya/plugins/publish/validate_rendersettings.py b/openpype/hosts/maya/plugins/publish/validate_rendersettings.py
index 3409b4ec91..f2a98eab32 100644
--- a/openpype/hosts/maya/plugins/publish/validate_rendersettings.py
+++ b/openpype/hosts/maya/plugins/publish/validate_rendersettings.py
@@ -371,7 +371,6 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
continue
for node in data["nodes"]:
lib.set_attribute(data["attribute"], data["values"][0], node)
-
with lib.renderlayer(layer_node):
# Repair animation must be enabled
@@ -392,13 +391,11 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
if renderer != "renderman":
prefix_attr = RenderSettings.get_image_prefix_attr(renderer)
fname_prefix = default_prefix
- cmds.setAttr("{}.{}".format(node, prefix_attr),
- fname_prefix, type="string")
+ cmds.setAttr(prefix_attr, fname_prefix, type="string")
# Repair padding
padding_attr = RenderSettings.get_padding_attr(renderer)
- cmds.setAttr("{}.{}".format(node, padding_attr),
- cls.DEFAULT_PADDING)
+ cmds.setAttr(padding_attr, cls.DEFAULT_PADDING)
else:
# renderman handles stuff differently
cmds.setAttr("rmanGlobals.imageFileFormat",
diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py
index 7bc17ff504..12562a6b6f 100644
--- a/openpype/hosts/nuke/api/pipeline.py
+++ b/openpype/hosts/nuke/api/pipeline.py
@@ -260,7 +260,7 @@ def _install_menu():
"Create...",
lambda: host_tools.show_publisher(
parent=(
- main_window if nuke.NUKE_VERSION_RELEASE >= 14 else None
+ main_window if nuke.NUKE_VERSION_MAJOR >= 14 else None
),
tab="create"
)
@@ -271,7 +271,7 @@ def _install_menu():
"Publish...",
lambda: host_tools.show_publisher(
parent=(
- main_window if nuke.NUKE_VERSION_RELEASE >= 14 else None
+ main_window if nuke.NUKE_VERSION_MAJOR >= 14 else None
),
tab="publish"
)
diff --git a/openpype/hosts/nuke/api/plugin.py b/openpype/hosts/nuke/api/plugin.py
index 301b9533a9..15d7bfc4b9 100644
--- a/openpype/hosts/nuke/api/plugin.py
+++ b/openpype/hosts/nuke/api/plugin.py
@@ -21,6 +21,11 @@ from openpype.pipeline import (
CreatedInstance,
get_current_task_name
)
+from openpype.pipeline.colorspace import (
+ get_display_view_colorspace_name,
+ get_colorspace_settings_from_publish_context,
+ set_colorspace_data_to_representation
+)
from openpype.lib.transcoding import (
VIDEO_EXTENSIONS
)
@@ -612,7 +617,7 @@ class ExporterReview(object):
def get_representation_data(
self, tags=None, range=False,
- custom_tags=None
+ custom_tags=None, colorspace=None
):
""" Add representation data to self.data
@@ -652,6 +657,14 @@ class ExporterReview(object):
if self.publish_on_farm:
repre["tags"].append("publish_on_farm")
+ # add colorspace data to representation
+ if colorspace:
+ set_colorspace_data_to_representation(
+ repre,
+ self.instance.context.data,
+ colorspace=colorspace,
+ log=self.log
+ )
self.data["representations"].append(repre)
def get_imageio_baking_profile(self):
@@ -866,6 +879,13 @@ class ExporterReviewMov(ExporterReview):
return path
def generate_mov(self, farm=False, **kwargs):
+ # colorspace data
+ colorspace = None
+ # get colorspace settings
+ # get colorspace data from context
+ config_data, _ = get_colorspace_settings_from_publish_context(
+ self.instance.context.data)
+
add_tags = []
self.publish_on_farm = farm
read_raw = kwargs["read_raw"]
@@ -951,6 +971,14 @@ class ExporterReviewMov(ExporterReview):
# assign viewer
dag_node["view"].setValue(viewer)
+ if config_data:
+ # convert display and view to colorspace
+ colorspace = get_display_view_colorspace_name(
+ config_path=config_data["path"],
+ display=display,
+ view=viewer
+ )
+
self._connect_to_above_nodes(dag_node, subset, "OCIODisplay... `{}`")
# Write node
write_node = nuke.createNode("Write")
@@ -996,9 +1024,10 @@ class ExporterReviewMov(ExporterReview):
# ---------- generate representation data
self.get_representation_data(
- tags=["review", "delete"] + add_tags,
+ tags=["review", "need_thumbnail", "delete"] + add_tags,
custom_tags=add_custom_tags,
- range=True
+ range=True,
+ colorspace=colorspace
)
self.log.debug("Representation... `{}`".format(self.data))
diff --git a/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py b/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py
index 7befb7b7f3..5816434f2b 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py
@@ -276,7 +276,7 @@ class ExtractSlateFrame(publish.Extractor):
if not matching_repre:
self.log.info(
- "Matching reresentation was not found."
+ "Matching representation was not found."
" Representation files were not filled with slate."
)
return
@@ -294,7 +294,7 @@ class ExtractSlateFrame(publish.Extractor):
self.log.debug(
"__ matching_repre: {}".format(pformat(matching_repre)))
- self.log.warning("Added slate frame to representation files")
+ self.log.info("Added slate frame to representation files")
def add_comment_slate_node(self, instance, node):
diff --git a/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py b/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
deleted file mode 100644
index de7567c1b1..0000000000
--- a/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
+++ /dev/null
@@ -1,216 +0,0 @@
-import sys
-import os
-import nuke
-import pyblish.api
-
-from openpype.pipeline import publish
-from openpype.hosts.nuke import api as napi
-from openpype.hosts.nuke.api.lib import set_node_knobs_from_settings
-
-
-# Python 2/3 compatibility
-if sys.version_info[0] >= 3:
- unicode = str
-
-
-class ExtractThumbnail(publish.Extractor):
- """Extracts movie and thumbnail with baked in luts
-
- must be run after extract_render_local.py
-
- """
-
- order = pyblish.api.ExtractorOrder + 0.011
- label = "Extract Thumbnail"
-
- families = ["review"]
- hosts = ["nuke"]
-
- # settings
- use_rendered = False
- bake_viewer_process = True
- bake_viewer_input_process = True
- nodes = {}
- reposition_nodes = None
-
- def process(self, instance):
- if instance.data.get("farm"):
- return
-
- with napi.maintained_selection():
- self.log.debug("instance: {}".format(instance))
- self.log.debug("instance.data[families]: {}".format(
- instance.data["families"]))
-
- if instance.data.get("bakePresets"):
- for o_name, o_data in instance.data["bakePresets"].items():
- self.render_thumbnail(instance, o_name, **o_data)
- else:
- viewer_process_switches = {
- "bake_viewer_process": True,
- "bake_viewer_input_process": True
- }
- self.render_thumbnail(
- instance, None, **viewer_process_switches)
-
- def render_thumbnail(self, instance, output_name=None, **kwargs):
- first_frame = instance.data["frameStartHandle"]
- last_frame = instance.data["frameEndHandle"]
- colorspace = instance.data["colorspace"]
-
- # find frame range and define middle thumb frame
- mid_frame = int((last_frame - first_frame) / 2)
-
- # solve output name if any is set
- output_name = output_name or ""
-
- bake_viewer_process = kwargs["bake_viewer_process"]
- bake_viewer_input_process_node = kwargs[
- "bake_viewer_input_process"]
-
- node = instance.data["transientData"]["node"] # group node
- self.log.debug("Creating staging dir...")
-
- if "representations" not in instance.data:
- instance.data["representations"] = []
-
- staging_dir = os.path.normpath(
- os.path.dirname(instance.data['path']))
-
- instance.data["stagingDir"] = staging_dir
-
- self.log.debug(
- "StagingDir `{0}`...".format(instance.data["stagingDir"]))
-
- temporary_nodes = []
-
- # try to connect already rendered images
- previous_node = node
- collection = instance.data.get("collection", None)
- self.log.debug("__ collection: `{}`".format(collection))
-
- if collection:
- # get path
- fhead = collection.format("{head}")
-
- thumb_fname = list(collection)[mid_frame]
- else:
- fname = thumb_fname = os.path.basename(
- instance.data.get("path", None))
- fhead = os.path.splitext(fname)[0] + "."
-
- self.log.debug("__ fhead: `{}`".format(fhead))
-
- if "#" in fhead:
- fhead = fhead.replace("#", "")[:-1]
-
- path_render = os.path.join(
- staging_dir, thumb_fname).replace("\\", "/")
- self.log.debug("__ path_render: `{}`".format(path_render))
-
- if self.use_rendered and os.path.isfile(path_render):
- # check if file exist otherwise connect to write node
- rnode = nuke.createNode("Read")
- rnode["file"].setValue(path_render)
- rnode["colorspace"].setValue(colorspace)
-
- # turn it raw if none of baking is ON
- if all([
- not self.bake_viewer_input_process,
- not self.bake_viewer_process
- ]):
- rnode["raw"].setValue(True)
-
- temporary_nodes.append(rnode)
- previous_node = rnode
-
- if self.reposition_nodes is None:
- # [deprecated] create reformat node old way
- reformat_node = nuke.createNode("Reformat")
- ref_node = self.nodes.get("Reformat", None)
- if ref_node:
- for k, v in ref_node:
- self.log.debug("k, v: {0}:{1}".format(k, v))
- if isinstance(v, unicode):
- v = str(v)
- reformat_node[k].setValue(v)
-
- reformat_node.setInput(0, previous_node)
- previous_node = reformat_node
- temporary_nodes.append(reformat_node)
- else:
- # create reformat node new way
- for repo_node in self.reposition_nodes:
- node_class = repo_node["node_class"]
- knobs = repo_node["knobs"]
- node = nuke.createNode(node_class)
- set_node_knobs_from_settings(node, knobs)
-
- # connect in order
- node.setInput(0, previous_node)
- previous_node = node
- temporary_nodes.append(node)
-
- # only create colorspace baking if toggled on
- if bake_viewer_process:
- if bake_viewer_input_process_node:
- # get input process and connect it to baking
- ipn = napi.get_view_process_node()
- if ipn is not None:
- ipn.setInput(0, previous_node)
- previous_node = ipn
- temporary_nodes.append(ipn)
-
- dag_node = nuke.createNode("OCIODisplay")
- dag_node.setInput(0, previous_node)
- previous_node = dag_node
- temporary_nodes.append(dag_node)
-
- thumb_name = "thumbnail"
- # only add output name and
- # if there are more than one bake preset
- if (
- output_name
- and len(instance.data.get("bakePresets", {}).keys()) > 1
- ):
- thumb_name = "{}_{}".format(output_name, thumb_name)
-
- # create write node
- write_node = nuke.createNode("Write")
- file = fhead[:-1] + thumb_name + ".jpg"
- thumb_path = os.path.join(staging_dir, file).replace("\\", "/")
-
- # add thumbnail to cleanup
- instance.context.data["cleanupFullPaths"].append(thumb_path)
-
- # make sure only one thumbnail path is set
- # and it is existing file
- instance_thumb_path = instance.data.get("thumbnailPath")
- if not instance_thumb_path or not os.path.isfile(instance_thumb_path):
- instance.data["thumbnailPath"] = thumb_path
-
- write_node["file"].setValue(thumb_path)
- write_node["file_type"].setValue("jpg")
- write_node["raw"].setValue(1)
- write_node.setInput(0, previous_node)
- temporary_nodes.append(write_node)
-
- repre = {
- 'name': thumb_name,
- 'ext': "jpg",
- "outputName": thumb_name,
- 'files': file,
- "stagingDir": staging_dir,
- "tags": ["thumbnail", "publish_on_farm", "delete"]
- }
- instance.data["representations"].append(repre)
-
- # Render frames
- nuke.execute(write_node.name(), mid_frame, mid_frame)
-
- self.log.debug(
- "representations: {}".format(instance.data["representations"]))
-
- # Clean up
- for node in temporary_nodes:
- nuke.delete(node)
diff --git a/openpype/hosts/photoshop/api/README.md b/openpype/hosts/photoshop/api/README.md
index 7bd2bcb1bf..a207d21f2f 100644
--- a/openpype/hosts/photoshop/api/README.md
+++ b/openpype/hosts/photoshop/api/README.md
@@ -9,7 +9,7 @@ The Photoshop integration requires two components to work; `extension` and `serv
To install the extension download [Extension Manager Command Line tool (ExManCmd)](https://github.com/Adobe-CEP/Getting-Started-guides/tree/master/Package%20Distribute%20Install#option-2---exmancmd).
```
-ExManCmd /install {path to avalon-core}\avalon\photoshop\extension.zxp
+ExManCmd /install {path to addon}/api/extension.zxp
```
### Server
@@ -17,16 +17,16 @@ ExManCmd /install {path to avalon-core}\avalon\photoshop\extension.zxp
The easiest way to get the server and Photoshop launch is with:
```
-python -c ^"import avalon.photoshop;avalon.photoshop.launch(""C:\Program Files\Adobe\Adobe Photoshop 2020\Photoshop.exe"")^"
+python -c ^"import openpype.hosts.photoshop;openpype.hosts.photoshop.launch(""C:\Program Files\Adobe\Adobe Photoshop 2020\Photoshop.exe"")^"
```
`avalon.photoshop.launch` launches the application and server, and also closes the server when Photoshop exists.
## Usage
-The Photoshop extension can be found under `Window > Extensions > Avalon`. Once launched you should be presented with a panel like this:
+The Photoshop extension can be found under `Window > Extensions > Ayon`. Once launched you should be presented with a panel like this:
-
+
## Developing
@@ -37,7 +37,7 @@ When developing the extension you can load it [unsigned](https://github.com/Adob
When signing the extension you can use this [guide](https://github.com/Adobe-CEP/Getting-Started-guides/tree/master/Package%20Distribute%20Install#package-distribute-install-guide).
```
-ZXPSignCmd -selfSignedCert NA NA Avalon Avalon-Photoshop avalon extension.p12
+ZXPSignCmd -selfSignedCert NA NA Ayon Ayon-Photoshop Ayon extension.p12
ZXPSignCmd -sign {path to avalon-core}\avalon\photoshop\extension {path to avalon-core}\avalon\photoshop\extension.zxp extension.p12 avalon
```
diff --git a/openpype/hosts/photoshop/api/extension.zxp b/openpype/hosts/photoshop/api/extension.zxp
index 39b766cd0d..26a73a37fd 100644
Binary files a/openpype/hosts/photoshop/api/extension.zxp and b/openpype/hosts/photoshop/api/extension.zxp differ
diff --git a/openpype/hosts/photoshop/api/extension/.debug b/openpype/hosts/photoshop/api/extension/.debug
index a0e2f3c9e0..4cea03cb41 100644
--- a/openpype/hosts/photoshop/api/extension/.debug
+++ b/openpype/hosts/photoshop/api/extension/.debug
@@ -1,9 +1,9 @@
-
+
-
\ No newline at end of file
+
diff --git a/openpype/hosts/photoshop/api/extension/CSXS/manifest.xml b/openpype/hosts/photoshop/api/extension/CSXS/manifest.xml
index 2089d06da1..16d85be9b4 100644
--- a/openpype/hosts/photoshop/api/extension/CSXS/manifest.xml
+++ b/openpype/hosts/photoshop/api/extension/CSXS/manifest.xml
@@ -1,7 +1,7 @@
-
+
-
+
@@ -16,7 +16,7 @@
-
+
./index.html
@@ -32,7 +32,7 @@
Panel
-
+
300
@@ -44,7 +44,7 @@
- ./icons/avalon-logo-48.png
+ ./icons/ayon_logo.png
diff --git a/openpype/hosts/photoshop/api/extension/icons/avalon-logo-48.png b/openpype/hosts/photoshop/api/extension/icons/avalon-logo-48.png
deleted file mode 100644
index 33fe2a606b..0000000000
Binary files a/openpype/hosts/photoshop/api/extension/icons/avalon-logo-48.png and /dev/null differ
diff --git a/openpype/hosts/photoshop/api/extension/icons/ayon_logo.png b/openpype/hosts/photoshop/api/extension/icons/ayon_logo.png
new file mode 100644
index 0000000000..3a96f8e2b4
Binary files /dev/null and b/openpype/hosts/photoshop/api/extension/icons/ayon_logo.png differ
diff --git a/openpype/hosts/photoshop/api/panel.PNG b/openpype/hosts/photoshop/api/panel.PNG
deleted file mode 100644
index be5db3b8df..0000000000
Binary files a/openpype/hosts/photoshop/api/panel.PNG and /dev/null differ
diff --git a/openpype/hosts/aftereffects/api/panel.PNG b/openpype/hosts/photoshop/api/panel.png
similarity index 100%
rename from openpype/hosts/aftereffects/api/panel.PNG
rename to openpype/hosts/photoshop/api/panel.png
diff --git a/openpype/hosts/photoshop/api/panel_failure.PNG b/openpype/hosts/photoshop/api/panel_failure.PNG
deleted file mode 100644
index 67afc4e212..0000000000
Binary files a/openpype/hosts/photoshop/api/panel_failure.PNG and /dev/null differ
diff --git a/openpype/hosts/photoshop/api/panel_failure.png b/openpype/hosts/photoshop/api/panel_failure.png
new file mode 100644
index 0000000000..6e52a77d22
Binary files /dev/null and b/openpype/hosts/photoshop/api/panel_failure.png differ
diff --git a/openpype/hosts/photoshop/plugins/publish/extract_review.py b/openpype/hosts/photoshop/plugins/publish/extract_review.py
index d5dac417d7..09c5d63aa5 100644
--- a/openpype/hosts/photoshop/plugins/publish/extract_review.py
+++ b/openpype/hosts/photoshop/plugins/publish/extract_review.py
@@ -170,8 +170,7 @@ class ExtractReview(publish.Extractor):
# Generate mov.
mov_path = os.path.join(staging_dir, "review.mov")
self.log.info(f"Generate mov review: {mov_path}")
- args = [
- ffmpeg_path,
+ args = ffmpeg_path + [
"-y",
"-i", source_files_pattern,
"-vf", "pad=ceil(iw/2)*2:ceil(ih/2)*2",
@@ -224,6 +223,7 @@ class ExtractReview(publish.Extractor):
"stagingDir": staging_dir,
"tags": ["thumbnail", "delete"]
})
+ instance.data["thumbnailPath"] = thumbnail_path
def _check_and_resize(self, processed_img_names, source_files_pattern,
staging_dir):
diff --git a/openpype/hosts/resolve/api/lib.py b/openpype/hosts/resolve/api/lib.py
index aef9caca78..3866477c77 100644
--- a/openpype/hosts/resolve/api/lib.py
+++ b/openpype/hosts/resolve/api/lib.py
@@ -298,7 +298,7 @@ def create_timeline_item(
if source_end:
clip_data["endFrame"] = source_end
if timecode_in:
- clip_data["recordFrame"] = timecode_in
+ clip_data["recordFrame"] = timeline_in
# add to timeline
media_pool.AppendToTimeline([clip_data])
diff --git a/openpype/hosts/resolve/api/menu.py b/openpype/hosts/resolve/api/menu.py
index 9c6fe4957c..2210178a67 100644
--- a/openpype/hosts/resolve/api/menu.py
+++ b/openpype/hosts/resolve/api/menu.py
@@ -7,6 +7,9 @@ from openpype.tools.utils import host_tools
from openpype.pipeline import registered_host
+MENU_LABEL = os.environ["AVALON_LABEL"]
+
+
def load_stylesheet():
path = os.path.join(os.path.dirname(__file__), "menu_style.qss")
if not os.path.exists(path):
@@ -39,7 +42,7 @@ class OpenPypeMenu(QtWidgets.QWidget):
def __init__(self, *args, **kwargs):
super(OpenPypeMenu, self).__init__(*args, **kwargs)
- self.setObjectName("OpenPypeMenu")
+ self.setObjectName(f"{MENU_LABEL}Menu")
self.setWindowFlags(
QtCore.Qt.Window
@@ -49,7 +52,7 @@ class OpenPypeMenu(QtWidgets.QWidget):
| QtCore.Qt.WindowStaysOnTopHint
)
- self.setWindowTitle("OpenPype")
+ self.setWindowTitle(f"{MENU_LABEL}")
save_current_btn = QtWidgets.QPushButton("Save current file", self)
workfiles_btn = QtWidgets.QPushButton("Workfiles ...", self)
create_btn = QtWidgets.QPushButton("Create ...", self)
diff --git a/openpype/hosts/resolve/api/plugin.py b/openpype/hosts/resolve/api/plugin.py
index 197f288150..a00933405f 100644
--- a/openpype/hosts/resolve/api/plugin.py
+++ b/openpype/hosts/resolve/api/plugin.py
@@ -406,26 +406,42 @@ class ClipLoader:
self.active_bin
)
_clip_property = media_pool_item.GetClipProperty
+ source_in = int(_clip_property("Start"))
+ source_out = int(_clip_property("End"))
+ source_duration = int(_clip_property("Frames"))
- # get handles
- handle_start = self.data["versionData"].get("handleStart")
- handle_end = self.data["versionData"].get("handleEnd")
- if handle_start is None:
- handle_start = int(self.data["assetData"]["handleStart"])
- if handle_end is None:
- handle_end = int(self.data["assetData"]["handleEnd"])
+ if not self.with_handles:
+ # Load file without the handles of the source media
+ # We remove the handles from the source in and source out
+ # so that the handles are excluded in the timeline
+ handle_start = 0
+ handle_end = 0
- # check frame duration from versionData or assetData
- frame_start = self.data["versionData"].get("frameStart")
- if frame_start is None:
- frame_start = self.data["assetData"]["frameStart"]
+ # get version data frame data from db
+ version_data = self.data["versionData"]
+ frame_start = version_data.get("frameStart")
+ frame_end = version_data.get("frameEnd")
- # check frame duration from versionData or assetData
- frame_end = self.data["versionData"].get("frameEnd")
- if frame_end is None:
- frame_end = self.data["assetData"]["frameEnd"]
-
- db_frame_duration = int(frame_end) - int(frame_start) + 1
+ # The version data usually stored the frame range + handles of the
+ # media however certain representations may be shorter because they
+ # exclude those handles intentionally. Unfortunately the
+ # representation does not store that in the database currently;
+ # so we should compensate for those cases. If the media is shorter
+ # than the frame range specified in the database we assume it is
+ # without handles and thus we do not need to remove the handles
+ # from source and out
+ if frame_start is not None and frame_end is not None:
+ # Version has frame range data, so we can compare media length
+ handle_start = version_data.get("handleStart", 0)
+ handle_end = version_data.get("handleEnd", 0)
+ frame_start_handle = frame_start - handle_start
+ frame_end_handle = frame_start + handle_end
+ database_frame_duration = int(
+ frame_end_handle - frame_start_handle + 1
+ )
+ if source_duration >= database_frame_duration:
+ source_in += handle_start
+ source_out -= handle_end
# get timeline in
timeline_start = self.active_timeline.GetStartFrame()
@@ -437,24 +453,6 @@ class ClipLoader:
timeline_in = int(
timeline_start + self.data["assetData"]["clipIn"])
- source_in = int(_clip_property("Start"))
- source_out = int(_clip_property("End"))
- source_duration = int(_clip_property("Frames"))
-
- # check if source duration is shorter than db frame duration
- source_with_handles = True
- if source_duration < db_frame_duration:
- source_with_handles = False
-
- # only exclude handles if source has no handles or
- # if user wants to load without handles
- if (
- not self.with_handles
- or not source_with_handles
- ):
- source_in += handle_start
- source_out -= handle_end
-
# make track item from source in bin as item
timeline_item = lib.create_timeline_item(
media_pool_item,
@@ -868,7 +866,7 @@ class PublishClip:
def _convert_to_entity(self, key):
""" Converting input key to key with type. """
# convert to entity type
- entity_type = self.types.get(key, None)
+ entity_type = self.types.get(key)
assert entity_type, "Missing entity type for `{}`".format(
key
diff --git a/openpype/hosts/resolve/utility_scripts/AYON__Menu.py b/openpype/hosts/resolve/utility_scripts/AYON__Menu.py
new file mode 100644
index 0000000000..4f14927074
--- /dev/null
+++ b/openpype/hosts/resolve/utility_scripts/AYON__Menu.py
@@ -0,0 +1,22 @@
+import os
+import sys
+
+from openpype.pipeline import install_host
+from openpype.lib import Logger
+
+log = Logger.get_logger(__name__)
+
+
+def main(env):
+ from openpype.hosts.resolve.api import ResolveHost, launch_pype_menu
+
+ # activate resolve from openpype
+ host = ResolveHost()
+ install_host(host)
+
+ launch_pype_menu()
+
+
+if __name__ == "__main__":
+ result = main(os.environ)
+ sys.exit(not bool(result))
diff --git a/openpype/hosts/resolve/utils.py b/openpype/hosts/resolve/utils.py
index 5e3003862f..9b91a14267 100644
--- a/openpype/hosts/resolve/utils.py
+++ b/openpype/hosts/resolve/utils.py
@@ -2,6 +2,7 @@ import os
import shutil
from openpype.lib import Logger, is_running_from_build
+from openpype import AYON_SERVER_ENABLED
RESOLVE_ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -54,6 +55,14 @@ def setup(env):
src = os.path.join(directory, script)
dst = os.path.join(util_scripts_dir, script)
+ # TODO: remove this once we have a proper solution
+ if AYON_SERVER_ENABLED:
+ if "OpenPype__Menu.py" == script:
+ continue
+ else:
+ if "AYON__Menu.py" == script:
+ continue
+
# TODO: Make this a less hacky workaround
if script == "openpype_startup.scriptlib":
# Handle special case for scriptlib that needs to be a folder
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py
index 9109bf6726..eb06875601 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py
@@ -257,8 +257,6 @@ class CollectHierarchyContext(pyblish.api.ContextPlugin):
if 'shot' not in instance.data.get('family', ''):
continue
- name = instance.data["asset"]
-
# get handles
handle_start = int(instance.data["handleStart"])
handle_end = int(instance.data["handleEnd"])
@@ -286,6 +284,8 @@ class CollectHierarchyContext(pyblish.api.ContextPlugin):
parents = instance.data.get('parents', [])
self.log.debug(f"parents: {pformat(parents)}")
+ # Split by '/' for AYON where asset is a path
+ name = instance.data["asset"].split("/")[-1]
actual = {name: in_info}
for parent in reversed(parents):
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_original_basename.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_original_basename.py
deleted file mode 100644
index b83a924d33..0000000000
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_original_basename.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Collect original base name for use in templates."""
-from pathlib import Path
-
-import pyblish.api
-
-
-class CollectOriginalBasename(pyblish.api.InstancePlugin):
- """Collect original file base name."""
-
- order = pyblish.api.CollectorOrder + 0.498
- label = "Collect Base Name"
- hosts = ["standalonepublisher"]
- families = ["simpleUnrealTexture"]
-
- def process(self, instance):
- file_name = Path(instance.data["representations"][0]["files"])
- instance.data["originalBasename"] = file_name.stem
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/validate_simple_unreal_texture_naming.py b/openpype/hosts/standalonepublisher/plugins/publish/validate_simple_unreal_texture_naming.py
deleted file mode 100644
index c123bef4f8..0000000000
--- a/openpype/hosts/standalonepublisher/plugins/publish/validate_simple_unreal_texture_naming.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Validator for correct file naming."""
-import re
-import pyblish.api
-
-from openpype.pipeline.publish import (
- ValidateContentsOrder,
- PublishXmlValidationError,
-)
-
-
-class ValidateSimpleUnrealTextureNaming(pyblish.api.InstancePlugin):
- label = "Validate Unreal Texture Names"
- hosts = ["standalonepublisher"]
- families = ["simpleUnrealTexture"]
- order = ValidateContentsOrder
- regex = "^T_{asset}.*"
-
- def process(self, instance):
- file_name = instance.data.get("originalBasename")
- self.log.info(file_name)
- pattern = self.regex.format(asset=instance.data.get("asset"))
- if not re.match(pattern, file_name):
- msg = f"Invalid file name {file_name}"
- raise PublishXmlValidationError(
- self, msg, formatting_data={
- "invalid_file": file_name,
- "asset": instance.data.get("asset")
- })
diff --git a/openpype/hosts/substancepainter/api/lib.py b/openpype/hosts/substancepainter/api/lib.py
index 2cd08f862e..1cb480b552 100644
--- a/openpype/hosts/substancepainter/api/lib.py
+++ b/openpype/hosts/substancepainter/api/lib.py
@@ -583,18 +583,9 @@ def prompt_new_file_with_mesh(mesh_filepath):
file_dialog.setDirectory(os.path.dirname(mesh_filepath))
url = QtCore.QUrl.fromLocalFile(os.path.basename(mesh_filepath))
file_dialog.selectUrl(url)
-
- # Give the explorer window time to refresh to the folder and select
- # the file
- while not file_dialog.selectedFiles():
- app.processEvents(QtCore.QEventLoop.ExcludeUserInputEvents, 1000)
- print(f"Selected: {file_dialog.selectedFiles()}")
-
- # Set it again now we know the path is refreshed - without this
- # accepting the dialog will often not trigger the correct filepath
- file_dialog.setDirectory(os.path.dirname(mesh_filepath))
- url = QtCore.QUrl.fromLocalFile(os.path.basename(mesh_filepath))
- file_dialog.selectUrl(url)
+ # TODO: find a way to improve the process event to
+ # load more complicated mesh
+ app.processEvents(QtCore.QEventLoop.ExcludeUserInputEvents, 3000)
file_dialog.done(file_dialog.Accepted)
app.processEvents(QtCore.QEventLoop.AllEvents)
@@ -628,7 +619,12 @@ def prompt_new_file_with_mesh(mesh_filepath):
mesh_filename_label = mesh_filename.findChild(QtWidgets.QLabel)
if not mesh_filename_label.text():
dialog.close()
- raise RuntimeError(f"Failed to set mesh path: {mesh_filepath}")
+ substance_painter.logging.warning(
+ "Failed to set mesh path with the prompt dialog:"
+ f"{mesh_filepath}\n\n"
+ "Creating new project directly with the mesh path instead.")
+ else:
+ dialog.done(dialog.Accepted)
new_action = _get_new_project_action()
if not new_action:
diff --git a/openpype/hosts/substancepainter/plugins/load/load_mesh.py b/openpype/hosts/substancepainter/plugins/load/load_mesh.py
index 57db869a11..08c1d5c391 100644
--- a/openpype/hosts/substancepainter/plugins/load/load_mesh.py
+++ b/openpype/hosts/substancepainter/plugins/load/load_mesh.py
@@ -44,14 +44,22 @@ class SubstanceLoadProjectMesh(load.LoaderPlugin):
# Get user inputs
import_cameras = data.get("import_cameras", True)
preserve_strokes = data.get("preserve_strokes", True)
-
+ sp_settings = substance_painter.project.Settings(
+ import_cameras=import_cameras
+ )
if not substance_painter.project.is_open():
# Allow to 'initialize' a new project
path = self.filepath_from_context(context)
+ # TODO: improve the prompt dialog function to not
+ # only works for simple polygon scene
result = prompt_new_file_with_mesh(mesh_filepath=path)
if not result:
- self.log.info("User cancelled new project prompt.")
- return
+ self.log.info("User cancelled new project prompt."
+ "Creating new project directly from"
+ " Substance Painter API Instead.")
+ settings = substance_painter.project.create(
+ mesh_file_path=path, settings=sp_settings
+ )
else:
# Reload the mesh
diff --git a/openpype/hosts/traypublisher/plugins/create/create_editorial.py b/openpype/hosts/traypublisher/plugins/create/create_editorial.py
index 26cce35d55..dce4a051fd 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_editorial.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_editorial.py
@@ -663,7 +663,7 @@ or updating already created. Publishing will create OTIO file.
variant_name = instance_data["variant"]
# basic unique asset name
- clip_name = os.path.splitext(otio_clip.name)[0].lower()
+ clip_name = os.path.splitext(otio_clip.name)[0]
project_doc = get_project(self.project_name)
shot_name, shot_metadata = self._shot_metadata_solver.generate_data(
diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py b/openpype/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py
index 5db2b0cbad..75c26ac958 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py
@@ -5,6 +5,7 @@ from openpype.pipeline import (
)
from openpype.lib import EnumDef
from openpype.pipeline import colorspace
+from openpype.pipeline.publish import KnownPublishError
class CollectColorspace(pyblish.api.InstancePlugin,
@@ -26,18 +27,44 @@ class CollectColorspace(pyblish.api.InstancePlugin,
def process(self, instance):
values = self.get_attr_values_from_data(instance.data)
- colorspace = values.get("colorspace", None)
- if colorspace is None:
+ colorspace_value = values.get("colorspace", None)
+ if colorspace_value is None:
return
- self.log.debug("Explicit colorspace set to: {}".format(colorspace))
+ color_data = colorspace.convert_colorspace_enumerator_item(
+ colorspace_value, self.config_items)
+
+ colorspace_name = self._colorspace_name_by_type(color_data)
+ self.log.debug("Explicit colorspace name: {}".format(colorspace_name))
context = instance.context
for repre in instance.data.get("representations", {}):
self.set_representation_colorspace(
representation=repre,
context=context,
- colorspace=colorspace
+ colorspace=colorspace_name
+ )
+
+ def _colorspace_name_by_type(self, colorspace_data):
+ """
+ Returns colorspace name by type
+
+ Arguments:
+ colorspace_data (dict): colorspace data
+
+ Returns:
+ str: colorspace name
+ """
+ if colorspace_data["type"] == "colorspaces":
+ return colorspace_data["name"]
+ elif colorspace_data["type"] == "roles":
+ return colorspace_data["colorspace"]
+ else:
+ raise KnownPublishError(
+ (
+ "Collecting of colorspace failed. used config is missing "
+ "colorspace type: '{}' . Please contact your pipeline TD."
+ ).format(colorspace_data['type'])
)
@classmethod
diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_shot_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_shot_instances.py
index e00ac64244..b99b634da1 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_shot_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_shot_instances.py
@@ -155,8 +155,6 @@ class CollectShotInstance(pyblish.api.InstancePlugin):
else {}
)
- asset_name = instance.data["asset"]
-
# get handles
handle_start = int(instance.data["handleStart"])
handle_end = int(instance.data["handleEnd"])
@@ -177,6 +175,8 @@ class CollectShotInstance(pyblish.api.InstancePlugin):
parents = instance.data.get('parents', [])
+ # Split by '/' for AYON where asset is a path
+ asset_name = instance.data["asset"].split("/")[-1]
actual = {asset_name: in_info}
for parent in reversed(parents):
diff --git a/openpype/hosts/traypublisher/plugins/publish/validate_colorspace.py b/openpype/hosts/traypublisher/plugins/publish/validate_colorspace.py
index 03f9f299b2..58c40938d2 100644
--- a/openpype/hosts/traypublisher/plugins/publish/validate_colorspace.py
+++ b/openpype/hosts/traypublisher/plugins/publish/validate_colorspace.py
@@ -33,7 +33,19 @@ class ValidateColorspace(pyblish.api.InstancePlugin,
config_path = colorspace_data["config"]["path"]
if config_path not in config_colorspaces:
colorspaces = get_ocio_config_colorspaces(config_path)
- config_colorspaces[config_path] = set(colorspaces)
+ if not colorspaces.get("colorspaces"):
+ message = (
+ f"OCIO config '{config_path}' does not contain any "
+ "colorspaces. This is an error in the OCIO config. "
+ "Contact your pipeline TD.",
+ )
+ raise PublishValidationError(
+ title="Colorspace validation",
+ message=message,
+ description=message
+ )
+ config_colorspaces[config_path] = set(
+ colorspaces["colorspaces"])
colorspace = colorspace_data["colorspace"]
self.log.debug(
diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py b/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py
index e89fbf7882..577e6e30e2 100644
--- a/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py
+++ b/openpype/hosts/tvpaint/plugins/publish/collect_render_instances.py
@@ -73,7 +73,7 @@ class CollectRenderInstances(pyblish.api.InstancePlugin):
render_layer_id = creator_attributes["render_layer_instance_id"]
for in_data in instance.context.data["workfileInstances"]:
if (
- in_data["creator_identifier"] == "render.layer"
+ in_data.get("creator_identifier") == "render.layer"
and in_data["instance_id"] == render_layer_id
):
render_layer_data = in_data
diff --git a/openpype/lib/__init__.py b/openpype/lib/__init__.py
index f1eb564e5e..b3b12ac250 100644
--- a/openpype/lib/__init__.py
+++ b/openpype/lib/__init__.py
@@ -111,6 +111,7 @@ from .transcoding import (
get_ffmpeg_format_args,
convert_ffprobe_fps_value,
convert_ffprobe_fps_to_float,
+ get_rescaled_command_arguments,
)
from .local_settings import (
@@ -232,6 +233,7 @@ __all__ = [
"get_ffmpeg_format_args",
"convert_ffprobe_fps_value",
"convert_ffprobe_fps_to_float",
+ "get_rescaled_command_arguments",
"IniSettingRegistry",
"JSONSettingRegistry",
diff --git a/openpype/lib/openpype_version.py b/openpype/lib/openpype_version.py
index 1c8356d5fe..5618eb0c2e 100644
--- a/openpype/lib/openpype_version.py
+++ b/openpype/lib/openpype_version.py
@@ -140,7 +140,7 @@ def is_running_staging():
latest_version = get_latest_version(local=False, remote=True)
staging_version = latest_version
- if current_version == production_version:
+ if current_version == staging_version:
return True
return is_staging_enabled()
diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py
index 334ea25ea4..316dedbd3d 100644
--- a/openpype/lib/transcoding.py
+++ b/openpype/lib/transcoding.py
@@ -655,47 +655,6 @@ def convert_for_ffmpeg(
run_subprocess(oiio_cmd, logger=logger)
-def get_oiio_input_and_channel_args(oiio_input_info):
- """Get input and channel arguments for oiiotool.
-
- Args:
- oiio_input_info (dict): Information about input from oiio tool.
- Should be output of function `get_oiio_info_for_input`.
-
- Returns:
- tuple[str, str]: Tuple of input and channel arguments.
- """
- channel_names = oiio_input_info["channelnames"]
- review_channels = get_convert_rgb_channels(channel_names)
-
- if review_channels is None:
- raise ValueError(
- "Couldn't find channels that can be used for conversion."
- )
-
- red, green, blue, alpha = review_channels
- input_channels = [red, green, blue]
-
- # TODO find subimage where rgba is available for multipart exrs
- channels_arg = "R={},G={},B={}".format(red, green, blue)
- if alpha is not None:
- channels_arg += ",A={}".format(alpha)
- input_channels.append(alpha)
-
- input_channels_str = ",".join(input_channels)
-
- subimages = oiio_input_info.get("subimages")
- input_arg = "-i"
- if subimages is None or subimages == 1:
- # Tell oiiotool which channels should be loaded
- # - other channels are not loaded to memory so helps to avoid memory
- # leak issues
- # - this option is crashing if used on multipart exrs
- input_arg += ":ch={}".format(input_channels_str)
-
- return input_arg, channels_arg
-
-
def convert_input_paths_for_ffmpeg(
input_paths,
output_dir,
@@ -1236,3 +1195,221 @@ def split_cmd_args(in_args):
continue
splitted_args.extend(arg.split(" "))
return splitted_args
+
+
+def get_rescaled_command_arguments(
+ application,
+ input_path,
+ target_width,
+ target_height,
+ target_par=None,
+ bg_color=None,
+ log=None
+):
+ """Get command arguments for rescaling input to target size.
+
+ Args:
+ application (str): Application for which command should be created.
+ Currently supported are "ffmpeg" and "oiiotool".
+ input_path (str): Path to input file.
+ target_width (int): Width of target.
+ target_height (int): Height of target.
+ target_par (Optional[float]): Pixel aspect ratio of target.
+ bg_color (Optional[list[int]]): List of 8bit int values for
+ background color. Should be in range 0 - 255.
+ log (Optional[logging.Logger]): Logger used for logging.
+
+ Returns:
+ list[str]: List of command arguments.
+ """
+ command_args = []
+ target_par = target_par or 1.0
+ input_par = 1.0
+
+ # ffmpeg command
+ input_file_metadata = get_ffprobe_data(input_path, logger=log)
+ stream = input_file_metadata["streams"][0]
+ input_width = int(stream["width"])
+ input_height = int(stream["height"])
+ stream_input_par = stream.get("sample_aspect_ratio")
+ if stream_input_par:
+ input_par = (
+ float(stream_input_par.split(":")[0])
+ / float(stream_input_par.split(":")[1])
+ )
+ # recalculating input and target width
+ input_width = int(input_width * input_par)
+ target_width = int(target_width * target_par)
+
+ # calculate aspect ratios
+ target_aspect = float(target_width) / target_height
+ input_aspect = float(input_width) / input_height
+
+ # calculate scale size
+ scale_size = float(input_width) / target_width
+ if input_aspect < target_aspect:
+ scale_size = float(input_height) / target_height
+
+ # calculate rescaled width and height
+ rescaled_width = int(input_width / scale_size)
+ rescaled_height = int(input_height / scale_size)
+
+ # calculate width and height shift
+ rescaled_width_shift = int((target_width - rescaled_width) / 2)
+ rescaled_height_shift = int((target_height - rescaled_height) / 2)
+
+ if application == "ffmpeg":
+ # create scale command
+ scale = "scale={0}:{1}".format(input_width, input_height)
+ pad = "pad={0}:{1}:({2}-iw)/2:({3}-ih)/2".format(
+ target_width,
+ target_height,
+ target_width,
+ target_height
+ )
+ if input_width > target_width or input_height > target_height:
+ scale = "scale={0}:{1}".format(rescaled_width, rescaled_height)
+ pad = "pad={0}:{1}:{2}:{3}".format(
+ target_width,
+ target_height,
+ rescaled_width_shift,
+ rescaled_height_shift
+ )
+
+ if bg_color:
+ color = convert_color_values(application, bg_color)
+ pad += ":{0}".format(color)
+ command_args.extend(["-vf", "{0},{1}".format(scale, pad)])
+
+ elif application == "oiiotool":
+ input_info = get_oiio_info_for_input(input_path, logger=log)
+ # Collect channels to export
+ _, channels_arg = get_oiio_input_and_channel_args(
+ input_info, alpha_default=1.0)
+
+ command_args.extend([
+ # Tell oiiotool which channels should be put to top stack
+ # (and output)
+ "--ch", channels_arg,
+ # Use first subimage
+ "--subimage", "0"
+ ])
+
+ if input_par != 1.0:
+ command_args.extend(["--pixelaspect", "1"])
+
+ width_shift = int((target_width - input_width) / 2)
+ height_shift = int((target_height - input_height) / 2)
+
+ # default resample is not scaling source image
+ resample = [
+ "--resize",
+ "{0}x{1}".format(input_width, input_height),
+ "--origin",
+ "+{0}+{1}".format(width_shift, height_shift),
+ ]
+ # scaled source image to target size
+ if input_width > target_width or input_height > target_height:
+ # form resample command
+ resample = [
+ "--resize:filter=lanczos3",
+ "{0}x{1}".format(rescaled_width, rescaled_height),
+ "--origin",
+ "+{0}+{1}".format(rescaled_width_shift, rescaled_height_shift),
+ ]
+ command_args.extend(resample)
+
+ fullsize = [
+ "--fullsize",
+ "{0}x{1}".format(target_width, target_height)
+ ]
+ if bg_color:
+ color = convert_color_values(application, bg_color)
+
+ fullsize.extend([
+ "--pattern",
+ "constant:color={0}".format(color),
+ "{0}x{1}".format(target_width, target_height),
+ "4", # 4 channels
+ "--over"
+ ])
+ command_args.extend(fullsize)
+
+ else:
+ raise ValueError(
+ "\"application\" input argument should "
+ "be either \"ffmpeg\" or \"oiiotool\""
+ )
+
+ return command_args
+
+
+def convert_color_values(application, color_value):
+ """Get color mapping for ffmpeg and oiiotool.
+ Args:
+ application (str): Application for which command should be created.
+ color_value (list[int]): List of 8bit int values for RGBA.
+ Returns:
+ str: ffmpeg returns hex string, oiiotool is string with floats.
+ """
+ red, green, blue, alpha = color_value
+
+ if application == "ffmpeg":
+ return "{0:0>2X}{1:0>2X}{2:0>2X}@{3}".format(
+ red, green, blue, (alpha / 255.0)
+ )
+ elif application == "oiiotool":
+ red = float(red / 255)
+ green = float(green / 255)
+ blue = float(blue / 255)
+ alpha = float(alpha / 255)
+
+ return "{0:.3f},{1:.3f},{2:.3f},{3:.3f}".format(
+ red, green, blue, alpha)
+ else:
+ raise ValueError(
+ "\"application\" input argument should "
+ "be either \"ffmpeg\" or \"oiiotool\""
+ )
+
+
+def get_oiio_input_and_channel_args(oiio_input_info, alpha_default=None):
+ """Get input and channel arguments for oiiotool.
+ Args:
+ oiio_input_info (dict): Information about input from oiio tool.
+ Should be output of function `get_oiio_info_for_input`.
+ alpha_default (float, optional): Default value for alpha channel.
+ Returns:
+ tuple[str, str]: Tuple of input and channel arguments.
+ """
+ channel_names = oiio_input_info["channelnames"]
+ review_channels = get_convert_rgb_channels(channel_names)
+
+ if review_channels is None:
+ raise ValueError(
+ "Couldn't find channels that can be used for conversion."
+ )
+
+ red, green, blue, alpha = review_channels
+ input_channels = [red, green, blue]
+
+ channels_arg = "R={0},G={1},B={2}".format(red, green, blue)
+ if alpha is not None:
+ channels_arg += ",A={}".format(alpha)
+ input_channels.append(alpha)
+ elif alpha_default:
+ channels_arg += ",A={}".format(float(alpha_default))
+ input_channels.append("A")
+
+ input_channels_str = ",".join(input_channels)
+
+ subimages = oiio_input_info.get("subimages")
+ input_arg = "-i"
+ if subimages is None or subimages == 1:
+ # Tell oiiotool which channels should be loaded
+ # - other channels are not loaded to memory so helps to avoid memory
+ # leak issues
+ # - this option is crashing if used on multipart exrs
+ input_arg += ":ch={}".format(input_channels_str)
+
+ return input_arg, channels_arg
diff --git a/openpype/modules/deadline/abstract_submit_deadline.py b/openpype/modules/deadline/abstract_submit_deadline.py
index 23e959d84c..187feb9b1a 100644
--- a/openpype/modules/deadline/abstract_submit_deadline.py
+++ b/openpype/modules/deadline/abstract_submit_deadline.py
@@ -460,7 +460,21 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
self.plugin_info = self.get_plugin_info()
self.aux_files = self.get_aux_files()
- self.process_submission()
+ job_id = self.process_submission()
+ self.log.info("Submitted job to Deadline: {}.".format(job_id))
+
+ # TODO: Find a way that's more generic and not render type specific
+ if "exportJob" in instance.data:
+ self.log.info("Splitting export and render in two jobs")
+ self.log.info("Export job id: %s", job_id)
+ render_job_info = self.get_job_info(dependency_job_ids=[job_id])
+ render_plugin_info = self.get_plugin_info(job_type="render")
+ payload = self.assemble_payload(
+ job_info=render_job_info,
+ plugin_info=render_plugin_info
+ )
+ render_job_id = self.submit(payload)
+ self.log.info("Render job id: %s", render_job_id)
def process_submission(self):
"""Process data for submission.
diff --git a/openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py b/openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py
index 58721efad3..cd4cde2519 100644
--- a/openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py
+++ b/openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py
@@ -2,6 +2,8 @@
"""Collect default Deadline server."""
import pyblish.api
+from openpype import AYON_SERVER_ENABLED
+
class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
"""Collect default Deadline Webservice URL.
@@ -30,24 +32,26 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
self.log.error("Cannot get OpenPype Deadline module.")
raise AssertionError("OpenPype Deadline module not found.")
- # get default deadline webservice url from deadline module
- self.log.debug(deadline_module.deadline_urls)
- context.data["defaultDeadline"] = deadline_module.deadline_urls["default"] # noqa: E501
+ deadline_settings = context.data["project_settings"]["deadline"]
+ deadline_server_name = None
+ if AYON_SERVER_ENABLED:
+ deadline_server_name = deadline_settings["deadline_server"]
+ else:
+ deadline_servers = deadline_settings["deadline_servers"]
+ if deadline_servers:
+ deadline_server_name = deadline_servers[0]
- context.data["deadlinePassMongoUrl"] = self.pass_mongo_url
+ context.data["deadlinePassMongoUrl"] = self.pass_mongo_url
- deadline_servers = (context.data
- ["project_settings"]
- ["deadline"]
- ["deadline_servers"])
- if deadline_servers:
- deadline_server_name = deadline_servers[0]
+ deadline_webservice = None
+ if deadline_server_name:
deadline_webservice = deadline_module.deadline_urls.get(
deadline_server_name)
- if deadline_webservice:
- context.data["defaultDeadline"] = deadline_webservice
- self.log.debug("Overriding from project settings with {}".format( # noqa: E501
- deadline_webservice))
- context.data["defaultDeadline"] = \
- context.data["defaultDeadline"].strip().rstrip("/")
+ default_deadline_webservice = deadline_module.deadline_urls["default"]
+ deadline_webservice = (
+ deadline_webservice
+ or default_deadline_webservice
+ )
+
+ context.data["defaultDeadline"] = deadline_webservice.strip().rstrip("/") # noqa
diff --git a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
index 094f2b1821..8f9e9a7425 100644
--- a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
@@ -6,8 +6,14 @@ import getpass
import attr
from datetime import datetime
-from openpype.lib import is_running_from_build
+from openpype.lib import (
+ is_running_from_build,
+ BoolDef,
+ NumberDef,
+ TextDef,
+)
from openpype.pipeline import legacy_io
+from openpype.pipeline.publish import OpenPypePyblishPluginMixin
from openpype.pipeline.farm.tools import iter_expected_files
from openpype.tests.lib import is_in_tests
@@ -22,10 +28,11 @@ class BlenderPluginInfo():
SaveFile = attr.ib(default=True)
-class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
+class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
+ OpenPypePyblishPluginMixin):
label = "Submit Render to Deadline"
hosts = ["blender"]
- families = ["render.farm"]
+ families = ["render"]
use_published = True
priority = 50
@@ -33,6 +40,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
jobInfo = {}
pluginInfo = {}
group = None
+ job_delay = "00:00:00:00"
def get_job_info(self):
job_info = DeadlineJobInfo(Plugin="Blender")
@@ -67,8 +75,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
job_info.Pool = instance.data.get("primaryPool")
job_info.SecondaryPool = instance.data.get("secondaryPool")
- job_info.Comment = context.data.get("comment")
- job_info.Priority = instance.data.get("priority", self.priority)
+ job_info.Comment = instance.data.get("comment")
if self.group != "none" and self.group:
job_info.Group = self.group
@@ -83,8 +90,10 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
machine_list_key = "Blacklist"
render_globals[machine_list_key] = machine_list
- job_info.Priority = attr_values.get("priority")
- job_info.ChunkSize = attr_values.get("chunkSize")
+ job_info.ChunkSize = attr_values.get("chunkSize", self.chunk_size)
+ job_info.Priority = attr_values.get("priority", self.priority)
+ job_info.ScheduledType = "Once"
+ job_info.JobDelay = attr_values.get("job_delay", self.job_delay)
# Add options from RenderGlobals
render_globals = instance.data.get("renderGlobals", {})
@@ -180,3 +189,39 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
the metadata and the rendered files are in the same location.
"""
return super().from_published_scene(False)
+
+ @classmethod
+ def get_attribute_defs(cls):
+ defs = super(BlenderSubmitDeadline, 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"),
+
+ TextDef("job_delay",
+ default=cls.job_delay,
+ label="Job Delay",
+ placeholder="dd:hh:mm:ss",
+ tooltip="Delay the job by the specified amount of time. "
+ "Timecode: dd:hh:mm:ss."),
+ ])
+
+ return defs
diff --git a/openpype/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py b/openpype/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py
index 2b6231e916..ada69575a8 100644
--- a/openpype/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py
@@ -2,8 +2,6 @@ import os
import getpass
from datetime import datetime
-import hou
-
import attr
import pyblish.api
from openpype.lib import (
@@ -141,6 +139,9 @@ class HoudiniCacheSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline
return job_info
def get_plugin_info(self):
+ # Not all hosts can import this module.
+ import hou
+
instance = self._instance
version = hou.applicationVersionString()
version = ".".join(version.split(".")[:2])
@@ -167,6 +168,9 @@ class HoudiniCacheSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline
instance.data["toBeRenderedOn"] = "deadline"
def get_rop_node(self, instance):
+ # Not all hosts can import this module.
+ import hou
+
rop = instance.data.get("instance_node")
rop_node = hou.node(rop)
diff --git a/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
index abc650204b..0c75f632cb 100644
--- a/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
@@ -5,12 +5,15 @@ from datetime import datetime
import pyblish.api
-from openpype.pipeline import legacy_io
+from openpype.pipeline import legacy_io, OpenPypePyblishPluginMixin
from openpype.tests.lib import is_in_tests
from openpype_modules.deadline import abstract_submit_deadline
from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo
-from openpype.lib import is_running_from_build
-
+from openpype.lib import (
+ is_running_from_build,
+ BoolDef,
+ NumberDef
+)
@attr.s
class DeadlinePluginInfo():
@@ -20,8 +23,29 @@ class DeadlinePluginInfo():
IgnoreInputs = attr.ib(default=True)
-class HoudiniSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
- """Submit Solaris USD Render ROPs to Deadline.
+@attr.s
+class ArnoldRenderDeadlinePluginInfo():
+ InputFile = attr.ib(default=None)
+ Verbose = attr.ib(default=4)
+
+
+@attr.s
+class MantraRenderDeadlinePluginInfo():
+ SceneFile = attr.ib(default=None)
+ Version = attr.ib(default=None)
+
+
+@attr.s
+class VrayRenderPluginInfo():
+ InputFilename = attr.ib(default=None)
+ SeparateFilesPerFrame = attr.ib(default=True)
+
+
+class HoudiniSubmitDeadline(
+ abstract_submit_deadline.AbstractSubmitDeadline,
+ OpenPypePyblishPluginMixin
+):
+ """Submit Render ROPs to Deadline.
Renders are submitted to a Deadline Web Service as
supplied via the environment variable AVALON_DEADLINE.
@@ -45,21 +69,95 @@ class HoudiniSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
targets = ["local"]
use_published = True
- def get_job_info(self):
- job_info = DeadlineJobInfo(Plugin="Houdini")
+ # presets
+ priority = 50
+ chunk_size = 1
+ export_priority = 50
+ export_chunk_size = 10
+ group = ""
+ export_group = ""
+
+ @classmethod
+ def get_attribute_defs(cls):
+ return [
+ NumberDef(
+ "priority",
+ label="Priority",
+ default=cls.priority,
+ decimals=0
+ ),
+ NumberDef(
+ "chunk",
+ label="Frames Per Task",
+ default=cls.chunk_size,
+ decimals=0,
+ minimum=1,
+ maximum=1000
+ ),
+ NumberDef(
+ "export_priority",
+ label="Export Priority",
+ default=cls.priority,
+ decimals=0
+ ),
+ NumberDef(
+ "export_chunk",
+ label="Export Frames Per Task",
+ default=cls.export_chunk_size,
+ decimals=0,
+ minimum=1,
+ maximum=1000
+ ),
+ BoolDef(
+ "suspend_publish",
+ default=False,
+ label="Suspend publish"
+ )
+ ]
+
+ def get_job_info(self, dependency_job_ids=None):
instance = self._instance
context = instance.context
+ attribute_values = self.get_attr_values_from_data(instance.data)
+
+ # Whether Deadline render submission is being split in two
+ # (extract + render)
+ split_render_job = instance.data["exportJob"]
+
+ # If there's some dependency job ids we can assume this is a render job
+ # and not an export job
+ is_export_job = True
+ if dependency_job_ids:
+ is_export_job = False
+
+ if split_render_job and not is_export_job:
+ # Convert from family to Deadline plugin name
+ # i.e., arnold_rop -> Arnold
+ plugin = instance.data["family"].replace("_rop", "").capitalize()
+ else:
+ plugin = "Houdini"
+
+ job_info = DeadlineJobInfo(Plugin=plugin)
+
filepath = context.data["currentFile"]
filename = os.path.basename(filepath)
-
job_info.Name = "{} - {}".format(filename, instance.name)
job_info.BatchName = filename
- job_info.Plugin = "Houdini"
+
job_info.UserName = context.data.get(
"deadlineUser", getpass.getuser())
+ if split_render_job and is_export_job:
+ job_info.Priority = attribute_values.get(
+ "export_priority", self.export_priority
+ )
+ else:
+ job_info.Priority = attribute_values.get(
+ "priority", self.priority
+ )
+
if is_in_tests():
job_info.BatchName += datetime.now().strftime("%d%m%Y%H%M%S")
@@ -73,9 +171,23 @@ class HoudiniSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
)
job_info.Frames = frames
+ # Make sure we make job frame dependent so render tasks pick up a soon
+ # as export tasks are done
+ if split_render_job and not is_export_job:
+ job_info.IsFrameDependent = True
+
job_info.Pool = instance.data.get("primaryPool")
job_info.SecondaryPool = instance.data.get("secondaryPool")
- job_info.ChunkSize = instance.data.get("chunkSize", 10)
+ job_info.Group = self.group
+ if split_render_job and is_export_job:
+ job_info.ChunkSize = attribute_values.get(
+ "export_chunk", self.export_chunk_size
+ )
+ else:
+ job_info.ChunkSize = attribute_values.get(
+ "chunk", self.chunk_size
+ )
+
job_info.Comment = context.data.get("comment")
keys = [
@@ -101,6 +213,7 @@ class HoudiniSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
environment = dict({key: os.environ[key] for key in keys
if key in os.environ}, **legacy_io.Session)
+
for key in keys:
value = environment.get(key)
if value:
@@ -115,25 +228,51 @@ class HoudiniSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
job_info.OutputDirectory += dirname.replace("\\", "/")
job_info.OutputFilename += fname
+ # Add dependencies if given
+ if dependency_job_ids:
+ job_info.JobDependencies = ",".join(dependency_job_ids)
+
return job_info
- def get_plugin_info(self):
+ def get_plugin_info(self, job_type=None):
# Not all hosts can import this module.
import hou
instance = self._instance
context = instance.context
- # Output driver to render
- driver = hou.node(instance.data["instance_node"])
hou_major_minor = hou.applicationVersionString().rsplit(".", 1)[0]
- plugin_info = DeadlinePluginInfo(
- SceneFile=context.data["currentFile"],
- OutputDriver=driver.path(),
- Version=hou_major_minor,
- IgnoreInputs=True
- )
+ # Output driver to render
+ if job_type == "render":
+ family = instance.data.get("family")
+ if family == "arnold_rop":
+ plugin_info = ArnoldRenderDeadlinePluginInfo(
+ InputFile=instance.data["ifdFile"]
+ )
+ elif family == "mantra_rop":
+ plugin_info = MantraRenderDeadlinePluginInfo(
+ SceneFile=instance.data["ifdFile"],
+ Version=hou_major_minor,
+ )
+ elif family == "vray_rop":
+ plugin_info = VrayRenderPluginInfo(
+ InputFilename=instance.data["ifdFile"],
+ )
+ else:
+ self.log.error(
+ "Family '%s' not supported yet to split render job",
+ family
+ )
+ return
+ else:
+ driver = hou.node(instance.data["instance_node"])
+ plugin_info = DeadlinePluginInfo(
+ SceneFile=context.data["currentFile"],
+ OutputDriver=driver.path(),
+ Version=hou_major_minor,
+ IgnoreInputs=True
+ )
return attr.asdict(plugin_info)
diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
index fb3ab2710d..d03416ca00 100644
--- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
@@ -370,10 +370,6 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
environment = dict({key: os.environ[key] for key in keys
if key in os.environ}, **legacy_io.Session)
- for _path in os.environ:
- if _path.lower().startswith('openpype_'):
- environment[_path] = os.environ[_path]
-
# to recognize render jobs
if AYON_SERVER_ENABLED:
environment["AYON_BUNDLE_NAME"] = os.environ["AYON_BUNDLE_NAME"]
@@ -402,7 +398,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
self.log.debug("Submitting..")
self.log.debug(json.dumps(payload, indent=4, sort_keys=True))
- # adding expectied files to instance.data
+ # adding expected files to instance.data
self.expected_files(
instance,
render_path,
@@ -458,7 +454,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
def expected_files(
self,
instance,
- path,
+ filepath,
start_frame,
end_frame
):
@@ -467,21 +463,44 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
if not instance.data.get("expectedFiles"):
instance.data["expectedFiles"] = []
- dirname = os.path.dirname(path)
- file = os.path.basename(path)
+ dirname = os.path.dirname(filepath)
+ file = os.path.basename(filepath)
+ # since some files might be already tagged as publish_on_farm
+ # we need to avoid adding them to expected files since those would be
+ # duplicated into metadata.json file
+ representations = instance.data.get("representations", [])
+ # check if file is not in representations with publish_on_farm tag
+ for repre in representations:
+ # Skip if 'publish_on_farm' not available
+ if "publish_on_farm" not in repre.get("tags", []):
+ continue
+
+ # in case where single file (video, image) is already in
+ # representation file. Will be added to expected files via
+ # submit_publish_job.py
+ if file in repre.get("files", []):
+ self.log.debug(
+ "Skipping expected file: {}".format(filepath))
+ return
+
+ # in case path is hashed sequence expression
+ # (e.g. /path/to/file.####.png)
if "#" in file:
pparts = file.split("#")
padding = "%0{}d".format(len(pparts) - 1)
file = pparts[0] + padding + pparts[-1]
+ # in case input path was single file (video or image)
if "%" not in file:
- instance.data["expectedFiles"].append(path)
+ instance.data["expectedFiles"].append(filepath)
return
+ # shift start frame by 1 if slate is present
if instance.data.get("slate"):
start_frame -= 1
+ # add sequence files to expected files
for i in range(start_frame, (end_frame + 1)):
instance.data["expectedFiles"].append(
os.path.join(dirname, (file % i)).replace("\\", "/"))
diff --git a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
index 642608f991..96f131b922 100644
--- a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
+++ b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
@@ -429,7 +429,7 @@ def inject_ayon_environment(deadlinePlugin):
"separated list \"{}\"."
"The path to the render executable can be configured"
" from the Plugin Configuration in the Deadline Monitor."
- ).format(";".join(exe_list)))
+ ).format(exe_list))
print("--- Ayon executable: {}".format(exe))
diff --git a/openpype/modules/ftrack/lib/custom_attributes.py b/openpype/modules/ftrack/lib/custom_attributes.py
index 3e40bb02f2..76c7bcd403 100644
--- a/openpype/modules/ftrack/lib/custom_attributes.py
+++ b/openpype/modules/ftrack/lib/custom_attributes.py
@@ -66,7 +66,7 @@ def get_openpype_attr(session, split_hierarchical=True, query_keys=None):
"select {}"
" from CustomAttributeConfiguration"
# Kept `pype` for Backwards Compatibility
- " where group.name in (\"pype\", \"{}\")"
+ " where group.name in (\"pype\", \"ayon\", \"{}\")"
).format(", ".join(query_keys), CUST_ATTR_GROUP)
all_avalon_attr = session.query(cust_attrs_query).all()
for cust_attr in all_avalon_attr:
diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
index edad0b0132..4b1307f9f0 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
@@ -127,17 +127,25 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
other_representations = []
has_movie_review = False
for repre in instance_repres:
- self.log.debug("Representation {}".format(repre))
repre_tags = repre.get("tags") or []
+ # exclude representations with are going to be published on farm
+ if "publish_on_farm" in repre_tags:
+ continue
+
+ self.log.debug("Representation {}".format(repre))
+
+ # include only thumbnail representations
if repre.get("thumbnail") or "thumbnail" in repre_tags:
thumbnail_representations.append(repre)
+ # include only review representations
elif "ftrackreview" in repre_tags:
review_representations.append(repre)
if self._is_repre_video(repre):
has_movie_review = True
else:
+ # include all other representations
other_representations.append(repre)
# Prepare ftrack locations
@@ -230,6 +238,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
# Create review components
# Change asset name of each new component for review
multiple_reviewable = len(review_representations) > 1
+ extended_asset_name = None
for index, repre in enumerate(review_representations):
if not self._is_repre_video(repre) and has_movie_review:
self.log.debug("Movie repre has priority "
@@ -343,7 +352,8 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
# add extended name if any
if (
- not self.keep_first_subset_name_for_review
+ multiple_reviewable
+ and not self.keep_first_subset_name_for_review
and extended_asset_name
):
other_item["asset_data"]["name"] = extended_asset_name
diff --git a/openpype/modules/ftrack/plugins/publish/integrate_hierarchy_ftrack.py b/openpype/modules/ftrack/plugins/publish/integrate_hierarchy_ftrack.py
index a1aa7c0daa..68a31035f6 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_hierarchy_ftrack.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_hierarchy_ftrack.py
@@ -21,7 +21,7 @@ def get_pype_attr(session, split_hierarchical=True):
"select id, entity_type, object_type_id, is_hierarchical, default"
" from CustomAttributeConfiguration"
# Kept `pype` for Backwards Compatibility
- " where group.name in (\"pype\", \"{}\")"
+ " where group.name in (\"pype\", \"ayon\", \"{}\")"
).format(CUST_ATTR_GROUP)
all_avalon_attr = session.query(cust_attrs_query).all()
for cust_attr in all_avalon_attr:
diff --git a/openpype/modules/python_console_interpreter/window/widgets.py b/openpype/modules/python_console_interpreter/window/widgets.py
index b670352f44..d046c0de50 100644
--- a/openpype/modules/python_console_interpreter/window/widgets.py
+++ b/openpype/modules/python_console_interpreter/window/widgets.py
@@ -8,10 +8,12 @@ import appdirs
from qtpy import QtCore, QtWidgets, QtGui
from openpype import resources
+from openpype import AYON_SERVER_ENABLED
from openpype.style import load_stylesheet
from openpype.lib import JSONSettingRegistry
+
openpype_art = """
. . .. . ..
_oOOP3OPP3Op_. .
@@ -27,6 +29,18 @@ openpype_art = """
~P3.OPPPO3OP~ . .. .
. ' '. . .. . . . .. .
+"""
+
+ayon_art = r"""
+
+ ββββ
+ βββββ ββββ ββββ ββββ βββββββββ βββββ ββ
+ ββ ββββ ββββ ββββ βββ ββββ β ββββ βββ
+ ββββ βββ β ββ β ββ βββ βββ ββββ βββ
+ ββββ ββββ ββ ββββ ββββ βββ βββ βββ
+ ββββ ββββ ββ ββββββββββ ββ ββββ
+
+ Β· Β· - =[ by YNPUT ]:[ http://ayon.ynput.io ]= - Β· Β·
"""
@@ -41,8 +55,12 @@ class PythonInterpreterRegistry(JSONSettingRegistry):
"""
def __init__(self):
- self.vendor = "pypeclub"
- self.product = "openpype"
+ if AYON_SERVER_ENABLED:
+ self.vendor = "ynput"
+ self.product = "ayon"
+ else:
+ self.vendor = "pypeclub"
+ self.product = "openpype"
name = "python_interpreter_tool"
path = appdirs.user_data_dir(self.product, self.vendor)
super(PythonInterpreterRegistry, self).__init__(name, path)
@@ -336,10 +354,12 @@ class PythonInterpreterWidget(QtWidgets.QWidget):
default_width = 1000
default_height = 600
- def __init__(self, parent=None):
+ def __init__(self, allow_save_registry=True, parent=None):
super(PythonInterpreterWidget, self).__init__(parent)
- self.setWindowTitle("OpenPype Console")
+ self.setWindowTitle("{} Console".format(
+ "AYON" if AYON_SERVER_ENABLED else "OpenPype"
+ ))
self.setWindowIcon(QtGui.QIcon(resources.get_openpype_icon_filepath()))
self.ansi_escape = re.compile(
@@ -387,10 +407,15 @@ class PythonInterpreterWidget(QtWidgets.QWidget):
self._tab_widget = tab_widget
self._line_check_timer = line_check_timer
- self._append_lines([openpype_art])
+ if AYON_SERVER_ENABLED:
+ self._append_lines([ayon_art])
+ else:
+ self._append_lines([openpype_art])
self._first_show = True
self._splitter_size_ratio = None
+ self._allow_save_registry = allow_save_registry
+ self._registry_saved = True
self._init_from_registry()
@@ -434,6 +459,11 @@ class PythonInterpreterWidget(QtWidgets.QWidget):
pass
def save_registry(self):
+ # Window was not showed
+ if not self._allow_save_registry or self._registry_saved:
+ return
+
+ self._registry_saved = True
setting_registry = PythonInterpreterRegistry()
setting_registry.set_item("width", self.width())
@@ -627,6 +657,7 @@ class PythonInterpreterWidget(QtWidgets.QWidget):
def showEvent(self, event):
self._line_check_timer.start()
+ self._registry_saved = False
super(PythonInterpreterWidget, self).showEvent(event)
# First show setup
if self._first_show:
diff --git a/openpype/modules/royalrender/lib.py b/openpype/modules/royalrender/lib.py
index 4708d25eed..9c4221d9cd 100644
--- a/openpype/modules/royalrender/lib.py
+++ b/openpype/modules/royalrender/lib.py
@@ -1,23 +1,28 @@
# -*- coding: utf-8 -*-
"""Submitting render job to RoyalRender."""
import os
-import re
+import json
import platform
+import re
+import tempfile
+import uuid
from datetime import datetime
import pyblish.api
-from openpype.tests.lib import is_in_tests
-from openpype.pipeline.publish.lib import get_published_workfile_instance
-from openpype.pipeline.publish import KnownPublishError
+
+from openpype.lib import BoolDef, NumberDef, is_running_from_build
+from openpype.lib.execute import run_openpype_process
from openpype.modules.royalrender.api import Api as rrApi
from openpype.modules.royalrender.rr_job import (
- RRJob, CustomAttribute, get_rr_platform)
-from openpype.lib import (
- is_running_from_build,
- BoolDef,
- NumberDef,
+ CustomAttribute,
+ RRJob,
+ RREnvList,
+ get_rr_platform,
)
from openpype.pipeline import OpenPypePyblishPluginMixin
+from openpype.pipeline.publish import KnownPublishError
+from openpype.pipeline.publish.lib import get_published_workfile_instance
+from openpype.tests.lib import is_in_tests
class BaseCreateRoyalRenderJob(pyblish.api.InstancePlugin,
@@ -302,3 +307,68 @@ class BaseCreateRoyalRenderJob(pyblish.api.InstancePlugin,
path = path.replace(first_frame, "#" * padding)
return path
+
+ def inject_environment(self, instance, job):
+ # type: (pyblish.api.Instance, RRJob) -> RRJob
+ """Inject environment variables for RR submission.
+
+ This function mimics the behaviour of the Deadline
+ integration. It is just temporary solution until proper
+ runtime environment injection is implemented in RR.
+
+ Args:
+ instance (pyblish.api.Instance): Publishing instance
+ job (RRJob): RRJob instance to be injected.
+
+ Returns:
+ RRJob: Injected RRJob instance.
+
+ Throws:
+ RuntimeError: If any of the required env vars is missing.
+
+ """
+
+ temp_file_name = "{}_{}.json".format(
+ datetime.utcnow().strftime('%Y%m%d%H%M%S%f'),
+ str(uuid.uuid1())
+ )
+
+ export_url = os.path.join(tempfile.gettempdir(), temp_file_name)
+ print(">>> Temporary path: {}".format(export_url))
+
+ args = [
+ "--headless",
+ "extractenvironments",
+ export_url
+ ]
+
+ anatomy_data = instance.context.data["anatomyData"]
+
+ add_kwargs = {
+ "project": anatomy_data["project"]["name"],
+ "asset": instance.context.data["asset"],
+ "task": anatomy_data["task"]["name"],
+ "app": instance.context.data.get("appName"),
+ "envgroup": "farm"
+ }
+
+ if os.getenv('IS_TEST'):
+ args.append("--automatic-tests")
+
+ if not all(add_kwargs.values()):
+ raise RuntimeError((
+ "Missing required env vars: AVALON_PROJECT, AVALON_ASSET,"
+ " AVALON_TASK, AVALON_APP_NAME"
+ ))
+
+ for key, value in add_kwargs.items():
+ args.extend([f"--{key}", value])
+ self.log.debug("Executing: {}".format(" ".join(args)))
+ run_openpype_process(*args, logger=self.log)
+
+ self.log.debug("Loading file ...")
+ with open(export_url) as fp:
+ contents = json.load(fp)
+
+ job.rrEnvList = RREnvList(contents).serialize()
+ return job
diff --git a/openpype/modules/royalrender/plugins/publish/create_maya_royalrender_job.py b/openpype/modules/royalrender/plugins/publish/create_maya_royalrender_job.py
index 22d910b7cd..775a2964fd 100644
--- a/openpype/modules/royalrender/plugins/publish/create_maya_royalrender_job.py
+++ b/openpype/modules/royalrender/plugins/publish/create_maya_royalrender_job.py
@@ -2,7 +2,7 @@
"""Submitting render job to RoyalRender."""
import os
-from maya.OpenMaya import MGlobal
+from maya.OpenMaya import MGlobal # noqa: F401
from openpype.modules.royalrender import lib
from openpype.pipeline.farm.tools import iter_expected_files
@@ -38,5 +38,6 @@ class CreateMayaRoyalRenderJob(lib.BaseCreateRoyalRenderJob):
job = self.get_job(instance, self.scene_path, first_file_path,
layer_name)
job = self.update_job_with_host_specific(instance, job)
+ job = self.inject_environment(instance, job)
instance.data["rrJobs"].append(job)
diff --git a/openpype/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py b/openpype/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py
index 71daa6edf8..4f589e56f8 100644
--- a/openpype/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py
+++ b/openpype/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py
@@ -25,6 +25,7 @@ class CreateNukeRoyalRenderJob(lib.BaseCreateRoyalRenderJob):
jobs = self.create_jobs(instance)
for job in jobs:
job = self.update_job_with_host_specific(instance, job)
+ job = self.inject_environment(instance, job)
instance.data["rrJobs"].append(job)
diff --git a/openpype/modules/royalrender/plugins/publish/create_publish_royalrender_job.py b/openpype/modules/royalrender/plugins/publish/create_publish_royalrender_job.py
index e13bf97e54..d4af1c2aee 100644
--- a/openpype/modules/royalrender/plugins/publish/create_publish_royalrender_job.py
+++ b/openpype/modules/royalrender/plugins/publish/create_publish_royalrender_job.py
@@ -205,6 +205,9 @@ class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin,
jobs_pre_ids = []
for job in instance.data["rrJobs"]: # type: RRJob
if job.rrEnvList:
+ if len(job.rrEnvList) > 2000:
+ self.log.warning(("Job environment is too long "
+ f"{len(job.rrEnvList)} > 2000"))
job_environ.update(
dict(RREnvList.parse(job.rrEnvList))
)
diff --git a/openpype/modules/royalrender/rr_job.py b/openpype/modules/royalrender/rr_job.py
index b85ac592f8..62a82d45e8 100644
--- a/openpype/modules/royalrender/rr_job.py
+++ b/openpype/modules/royalrender/rr_job.py
@@ -32,7 +32,7 @@ class RREnvList(dict):
"""Parse rrEnvList string and return it as RREnvList object."""
out = RREnvList()
for var in data.split("~~~"):
- k, v = var.split("=")
+ k, v = var.split("=", maxsplit=1)
out[k] = v
return out
@@ -172,7 +172,7 @@ class RRJob(object):
# Environment
# only used in RR 8.3 and newer
- rrEnvList = attr.ib(default=None) # type: str
+ rrEnvList = attr.ib(default=None, type=str) # type: str
class SubmitterParameter:
diff --git a/openpype/pipeline/actions.py b/openpype/pipeline/actions.py
index feb1bd05d2..68533f7485 100644
--- a/openpype/pipeline/actions.py
+++ b/openpype/pipeline/actions.py
@@ -7,6 +7,8 @@ from openpype.pipeline.plugin_discover import (
deregister_plugin_path
)
+from .load.utils import get_representation_path_from_context
+
class LauncherAction(object):
"""A custom action available"""
@@ -100,6 +102,10 @@ class InventoryAction(object):
"""
return True
+ @classmethod
+ def filepath_from_context(cls, context):
+ return get_representation_path_from_context(context)
+
# Launcher action
def discover_launcher_actions():
diff --git a/openpype/pipeline/farm/pyblish_functions.py b/openpype/pipeline/farm/pyblish_functions.py
index ce0ef4d343..54ff2627e1 100644
--- a/openpype/pipeline/farm/pyblish_functions.py
+++ b/openpype/pipeline/farm/pyblish_functions.py
@@ -145,6 +145,9 @@ def get_transferable_representations(instance):
trans_rep = representation.copy()
+ # remove publish_on_farm from representations tags
+ trans_rep["tags"].remove("publish_on_farm")
+
staging_dir = trans_rep.get("stagingDir")
if staging_dir:
diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py
index 99bdb12543..9dc833061a 100644
--- a/openpype/pipeline/workfile/workfile_template_builder.py
+++ b/openpype/pipeline/workfile/workfile_template_builder.py
@@ -19,6 +19,7 @@ from abc import ABCMeta, abstractmethod
import six
+from openpype import AYON_SERVER_ENABLED
from openpype.client import (
get_asset_by_name,
get_linked_assets,
@@ -1272,31 +1273,54 @@ class PlaceholderLoadMixin(object):
# Sort for readability
families = list(sorted(families))
- return [
+ if AYON_SERVER_ENABLED:
+ builder_type_enum_items = [
+ {"label": "Current folder", "value": "context_folder"},
+ # TODO implement linked folders
+ # {"label": "Linked folders", "value": "linked_folders"},
+ {"label": "All folders", "value": "all_folders"},
+ ]
+ build_type_label = "Folder Builder Type"
+ build_type_help = (
+ "Folder Builder Type\n"
+ "\nBuilder type describe what template loader will look"
+ " for."
+ "\nCurrent Folder: Template loader will look for products"
+ " of current context folder (Folder /assets/bob will"
+ " find asset)"
+ "\nAll folders: All folders matching the regex will be"
+ " used."
+ )
+ else:
+ builder_type_enum_items = [
+ {"label": "Current asset", "value": "context_asset"},
+ {"label": "Linked assets", "value": "linked_asset"},
+ {"label": "All assets", "value": "all_assets"},
+ ]
+ build_type_label = "Asset Builder Type"
+ build_type_help = (
+ "Asset Builder Type\n"
+ "\nBuilder type describe what template loader will look"
+ " for."
+ "\ncontext_asset : Template loader will look for subsets"
+ " of current context asset (Asset bob will find asset)"
+ "\nlinked_asset : Template loader will look for assets"
+ " linked to current context asset."
+ "\nLinked asset are looked in database under"
+ " field \"inputLinks\""
+ )
+
+ attr_defs = [
attribute_definitions.UISeparatorDef(),
attribute_definitions.UILabelDef("Main attributes"),
attribute_definitions.UISeparatorDef(),
attribute_definitions.EnumDef(
"builder_type",
- label="Asset Builder Type",
+ label=build_type_label,
default=options.get("builder_type"),
- items=[
- {"label": "Current asset", "value": "context_asset"},
- {"label": "Linked assets", "value": "linked_asset"},
- {"label": "All assets", "value": "all_assets"},
- ],
- tooltip=(
- "Asset Builder Type\n"
- "\nBuilder type describe what template loader will look"
- " for."
- "\ncontext_asset : Template loader will look for subsets"
- " of current context asset (Asset bob will find asset)"
- "\nlinked_asset : Template loader will look for assets"
- " linked to current context asset."
- "\nLinked asset are looked in database under"
- " field \"inputLinks\""
- )
+ items=builder_type_enum_items,
+ tooltip=build_type_help
),
attribute_definitions.EnumDef(
"family",
@@ -1352,34 +1376,63 @@ class PlaceholderLoadMixin(object):
attribute_definitions.UISeparatorDef(),
attribute_definitions.UILabelDef("Optional attributes"),
attribute_definitions.UISeparatorDef(),
- attribute_definitions.TextDef(
- "asset",
- label="Asset filter",
- default=options.get("asset"),
- placeholder="regex filtering by asset name",
- tooltip=(
- "Filtering assets by matching field regex to asset's name"
- )
- ),
- attribute_definitions.TextDef(
- "subset",
- label="Subset filter",
- default=options.get("subset"),
- placeholder="regex filtering by subset name",
- tooltip=(
- "Filtering assets by matching field regex to subset's name"
- )
- ),
- attribute_definitions.TextDef(
- "hierarchy",
- label="Hierarchy filter",
- default=options.get("hierarchy"),
- placeholder="regex filtering by asset's hierarchy",
- tooltip=(
- "Filtering assets by matching field asset's hierarchy"
- )
- )
]
+ if AYON_SERVER_ENABLED:
+ attr_defs.extend([
+ attribute_definitions.TextDef(
+ "folder_path",
+ label="Folder filter",
+ default=options.get("folder_path"),
+ placeholder="regex filtering by folder path",
+ tooltip=(
+ "Filtering assets by matching"
+ " field regex to folder path"
+ )
+ ),
+ attribute_definitions.TextDef(
+ "product_name",
+ label="Product filter",
+ default=options.get("product_name"),
+ placeholder="regex filtering by product name",
+ tooltip=(
+ "Filtering assets by matching"
+ " field regex to product name"
+ )
+ ),
+ ])
+ else:
+ attr_defs.extend([
+ attribute_definitions.TextDef(
+ "asset",
+ label="Asset filter",
+ default=options.get("asset"),
+ placeholder="regex filtering by asset name",
+ tooltip=(
+ "Filtering assets by matching"
+ " field regex to asset's name"
+ )
+ ),
+ attribute_definitions.TextDef(
+ "subset",
+ label="Subset filter",
+ default=options.get("subset"),
+ placeholder="regex filtering by subset name",
+ tooltip=(
+ "Filtering assets by matching"
+ " field regex to subset's name"
+ )
+ ),
+ attribute_definitions.TextDef(
+ "hierarchy",
+ label="Hierarchy filter",
+ default=options.get("hierarchy"),
+ placeholder="regex filtering by asset's hierarchy",
+ tooltip=(
+ "Filtering assets by matching field asset's hierarchy"
+ )
+ )
+ ])
+ return attr_defs
def parse_loader_args(self, loader_args):
"""Helper function to parse string of loader arugments.
@@ -1409,6 +1462,117 @@ class PlaceholderLoadMixin(object):
return {}
+ def _query_by_folder_regex(self, project_name, folder_regex):
+ """Query folders by folder path regex.
+
+ WARNING:
+ This method will be removed once the same functionality is
+ available in ayon-python-api.
+
+ Args:
+ project_name (str): Project name.
+ folder_regex (str): Regex for folder path.
+
+ Returns:
+ list[str]: List of folder paths.
+ """
+
+ from ayon_api.graphql_queries import folders_graphql_query
+ from openpype.client import get_ayon_server_api_connection
+
+ query = folders_graphql_query({"id"})
+
+ folders_field = None
+ for child in query._children:
+ if child.path != "project":
+ continue
+
+ for project_child in child._children:
+ if project_child.path == "project/folders":
+ folders_field = project_child
+ break
+ if folders_field:
+ break
+
+ if "folderPathRegex" not in query._variables:
+ folder_path_regex_var = query.add_variable(
+ "folderPathRegex", "String!"
+ )
+ folders_field.set_filter("pathEx", folder_path_regex_var)
+
+ query.set_variable_value("projectName", project_name)
+ if folder_regex:
+ query.set_variable_value("folderPathRegex", folder_regex)
+
+ api = get_ayon_server_api_connection()
+ for parsed_data in query.continuous_query(api):
+ for folder in parsed_data["project"]["folders"]:
+ yield folder["id"]
+
+ def _get_representations_ayon(self, placeholder):
+ # An OpenPype placeholder loaded in AYON
+ if "asset" in placeholder.data:
+ return []
+
+ representation_name = placeholder.data["representation"]
+ if not representation_name:
+ return []
+
+ project_name = self.builder.project_name
+ current_asset_doc = self.builder.current_asset_doc
+
+ folder_path_regex = placeholder.data["folder_path"]
+ product_name_regex_value = placeholder.data["product_name"]
+ product_name_regex = None
+ if product_name_regex_value:
+ product_name_regex = re.compile(product_name_regex_value)
+ product_type = placeholder.data["family"]
+
+ builder_type = placeholder.data["builder_type"]
+ folder_ids = []
+ if builder_type == "context_folder":
+ folder_ids = [current_asset_doc["_id"]]
+
+ elif builder_type == "all_folders":
+ folder_ids = list(self._query_by_folder_regex(
+ project_name, folder_path_regex
+ ))
+
+ if not folder_ids:
+ return []
+
+ from ayon_api import get_products, get_last_versions
+
+ products = list(get_products(
+ project_name,
+ folder_ids=folder_ids,
+ product_types=[product_type],
+ fields={"id", "name"}
+ ))
+ filtered_product_ids = set()
+ for product in products:
+ if (
+ product_name_regex is None
+ or product_name_regex.match(product["name"])
+ ):
+ filtered_product_ids.add(product["id"])
+
+ if not filtered_product_ids:
+ return []
+
+ version_ids = set(
+ version["id"]
+ for version in get_last_versions(
+ project_name, filtered_product_ids, fields={"id"}
+ ).values()
+ )
+ return list(get_representations(
+ project_name,
+ representation_names=[representation_name],
+ version_ids=version_ids
+ ))
+
+
def _get_representations(self, placeholder):
"""Prepared query of representations based on load options.
@@ -1428,6 +1592,13 @@ class PlaceholderLoadMixin(object):
from placeholder data.
"""
+ if AYON_SERVER_ENABLED:
+ return self._get_representations_ayon(placeholder)
+
+ # An AYON placeholder loaded in OpenPype
+ if "folder_path" in placeholder.data:
+ return []
+
project_name = self.builder.project_name
current_asset_doc = self.builder.current_asset_doc
linked_asset_docs = self.builder.linked_asset_docs
diff --git a/openpype/plugins/publish/collect_hierarchy.py b/openpype/plugins/publish/collect_hierarchy.py
index b5fd1e4bb9..32f10ba4c8 100644
--- a/openpype/plugins/publish/collect_hierarchy.py
+++ b/openpype/plugins/publish/collect_hierarchy.py
@@ -61,8 +61,9 @@ class CollectHierarchy(pyblish.api.ContextPlugin):
"resolutionHeight": instance.data["resolutionHeight"],
"pixelAspect": instance.data["pixelAspect"]
}
-
- actual = {instance.data["asset"]: shot_data}
+ # Split by '/' for AYON where asset is a path
+ name = instance.data["asset"].split("/")[-1]
+ actual = {name: shot_data}
for parent in reversed(instance.data["parents"]):
next_dict = {}
diff --git a/openpype/plugins/publish/collect_resources_path.py b/openpype/plugins/publish/collect_resources_path.py
index a7f12bdfdb..c8b67a3d05 100644
--- a/openpype/plugins/publish/collect_resources_path.py
+++ b/openpype/plugins/publish/collect_resources_path.py
@@ -68,12 +68,6 @@ class CollectResourcesPath(pyblish.api.InstancePlugin):
]
def process(self, instance):
- # editorial would fail since they might not be in database yet
- new_asset_publishing = instance.data.get("newAssetPublishing")
- if new_asset_publishing:
- self.log.debug("Instance is creating new asset. Skipping.")
- return
-
anatomy = instance.context.data["anatomy"]
template_data = copy.deepcopy(instance.data["anatomyData"])
@@ -85,11 +79,18 @@ class CollectResourcesPath(pyblish.api.InstancePlugin):
"representation": "TEMP"
})
- # For the first time publish
- if instance.data.get("hierarchy"):
- template_data.update({
- "hierarchy": instance.data["hierarchy"]
- })
+ # Add fill keys for editorial publishing creating new entity
+ # TODO handle in editorial plugin
+ if instance.data.get("newAssetPublishing"):
+ if "hierarchy" not in template_data:
+ template_data["hierarchy"] = instance.data["hierarchy"]
+
+ if "asset" not in template_data:
+ asset_name = instance.data["asset"].split("/")[-1]
+ template_data["asset"] = asset_name
+ template_data["folder"] = {
+ "name": asset_name
+ }
publish_templates = anatomy.templates_obj["publish"]
if "folder" in publish_templates:
diff --git a/openpype/plugins/publish/extract_burnin.py b/openpype/plugins/publish/extract_burnin.py
index 9a978ed286..56d45e477b 100644
--- a/openpype/plugins/publish/extract_burnin.py
+++ b/openpype/plugins/publish/extract_burnin.py
@@ -89,8 +89,8 @@ class ExtractBurnin(publish.Extractor):
self.main_process(instance)
- # Remove any representations tagged for deletion.
- # QUESTION Is possible to have representation with "delete" tag?
+ # Remove only representation tagged with both
+ # tags `delete` and `burnin`
for repre in tuple(instance.data["representations"]):
if all(x in repre.get("tags", []) for x in ['delete', 'burnin']):
self.log.debug("Removing representation: {}".format(repre))
diff --git a/openpype/plugins/publish/extract_hierarchy_to_ayon.py b/openpype/plugins/publish/extract_hierarchy_to_ayon.py
index ef69369d67..b601a3fc29 100644
--- a/openpype/plugins/publish/extract_hierarchy_to_ayon.py
+++ b/openpype/plugins/publish/extract_hierarchy_to_ayon.py
@@ -204,7 +204,8 @@ class ExtractHierarchyToAYON(pyblish.api.ContextPlugin):
project_item = None
project_children_context = None
- for key, value in context.data["hierarchyContext"].items():
+ hierarchy_context = copy.deepcopy(context.data["hierarchyContext"])
+ for key, value in hierarchy_context.items():
project_item = copy.deepcopy(value)
project_children_context = project_item.pop("childs", None)
project_item["name"] = key
@@ -223,23 +224,24 @@ class ExtractHierarchyToAYON(pyblish.api.ContextPlugin):
valid_ids = set()
hierarchy_queue = collections.deque()
- hierarchy_queue.append((project_id, project_children_context))
+ hierarchy_queue.append((project_id, "", project_children_context))
while hierarchy_queue:
queue_item = hierarchy_queue.popleft()
- parent_id, children_context = queue_item
+ parent_id, parent_path, children_context = queue_item
if not children_context:
continue
- for asset, asset_info in children_context.items():
+ for folder_name, folder_info in children_context.items():
+ folder_path = "{}/{}".format(parent_path, folder_name)
if (
- asset not in active_folder_paths
- and not asset_info.get("childs")
+ folder_path not in active_folder_paths
+ and not folder_info.get("childs")
):
continue
- asset_name = asset.split("/")[-1]
+
item_id = uuid.uuid4().hex
- new_item = copy.deepcopy(asset_info)
- new_item["name"] = asset_name
+ new_item = copy.deepcopy(folder_info)
+ new_item["name"] = folder_name
new_item["children"] = []
new_children_context = new_item.pop("childs", None)
tasks = new_item.pop("tasks", {})
@@ -253,9 +255,11 @@ class ExtractHierarchyToAYON(pyblish.api.ContextPlugin):
items_by_id[item_id] = new_item
parent_id_by_item_id[item_id] = parent_id
- if asset in active_folder_paths:
+ if folder_path in active_folder_paths:
valid_ids.add(item_id)
- hierarchy_queue.append((item_id, new_children_context))
+ hierarchy_queue.append(
+ (item_id, folder_path, new_children_context)
+ )
if not valid_ids:
return None
diff --git a/openpype/plugins/publish/extract_otio_audio_tracks.py b/openpype/plugins/publish/extract_otio_audio_tracks.py
index 4b73321f02..d5ab1d6032 100644
--- a/openpype/plugins/publish/extract_otio_audio_tracks.py
+++ b/openpype/plugins/publish/extract_otio_audio_tracks.py
@@ -319,6 +319,7 @@ class ExtractOtioAudioTracks(pyblish.api.ContextPlugin):
Returns:
str: temp fpath
"""
+ name = name.replace("/", "_")
return os.path.normpath(
tempfile.mktemp(
prefix="pyblish_tmp_{}_".format(name),
diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py
index cd0f78530a..8448c45e70 100644
--- a/openpype/plugins/publish/extract_review.py
+++ b/openpype/plugins/publish/extract_review.py
@@ -89,8 +89,18 @@ class ExtractReview(pyblish.api.InstancePlugin):
# Make sure cleanup happens and pop representations with "delete" tag.
for repre in tuple(instance.data["representations"]):
tags = repre.get("tags") or []
- if "delete" in tags and "thumbnail" not in tags:
- instance.data["representations"].remove(repre)
+ # Representation is not marked to be deleted
+ if "delete" not in tags:
+ continue
+
+ # The representation can be used as thumbnail source
+ if "thumbnail" in tags or "need_thumbnail" in tags:
+ continue
+
+ self.log.debug(
+ "Removing representation: {}".format(repre)
+ )
+ instance.data["representations"].remove(repre)
def _get_outputs_for_instance(self, instance):
host_name = instance.context.data["hostName"]
@@ -321,19 +331,26 @@ class ExtractReview(pyblish.api.InstancePlugin):
# Create copy of representation
new_repre = copy.deepcopy(repre)
+ new_tags = new_repre.get("tags") or []
# Make sure new representation has origin staging dir
# - this is because source representation may change
# it's staging dir because of ffmpeg conversion
new_repre["stagingDir"] = src_repre_staging_dir
# Remove "delete" tag from new repre if there is
- if "delete" in new_repre["tags"]:
- new_repre["tags"].remove("delete")
+ if "delete" in new_tags:
+ new_tags.remove("delete")
+
+ if "need_thumbnail" in new_tags:
+ new_tags.remove("need_thumbnail")
# Add additional tags from output definition to representation
for tag in output_def["tags"]:
- if tag not in new_repre["tags"]:
- new_repre["tags"].append(tag)
+ if tag not in new_tags:
+ new_tags.append(tag)
+
+ # Return tags to new representation
+ new_repre["tags"] = new_tags
# Add burnin link from output definition to representation
for burnin in output_def["burnins"]:
diff --git a/openpype/plugins/publish/extract_review_slate.py b/openpype/plugins/publish/extract_review_slate.py
index d89fbb90c4..4e3406d3f9 100644
--- a/openpype/plugins/publish/extract_review_slate.py
+++ b/openpype/plugins/publish/extract_review_slate.py
@@ -376,9 +376,13 @@ class ExtractReviewSlate(publish.Extractor):
# Remove any representations tagged for deletion.
for repre in inst_data.get("representations", []):
- if "delete" in repre.get("tags", []):
- self.log.debug("Removing representation: {}".format(repre))
- inst_data["representations"].remove(repre)
+ tags = repre.get("tags", [])
+ if "delete" not in tags:
+ continue
+ if "need_thumbnail" in tags:
+ continue
+ self.log.debug("Removing representation: {}".format(repre))
+ inst_data["representations"].remove(repre)
self.log.debug(inst_data["representations"])
diff --git a/openpype/plugins/publish/extract_thumbnail.py b/openpype/plugins/publish/extract_thumbnail.py
index c6112b3cdf..2b4ea0529a 100644
--- a/openpype/plugins/publish/extract_thumbnail.py
+++ b/openpype/plugins/publish/extract_thumbnail.py
@@ -1,3 +1,4 @@
+import copy
import os
import subprocess
import tempfile
@@ -5,13 +6,18 @@ import tempfile
import pyblish.api
from openpype.lib import (
get_ffmpeg_tool_args,
- is_oiio_supported,
+ get_ffprobe_data,
+
+ is_oiio_supported,
+ get_rescaled_command_arguments,
- run_subprocess,
path_to_subprocess_arg,
+ run_subprocess,
)
from openpype.lib.transcoding import convert_colorspace
+from openpype.lib.transcoding import VIDEO_EXTENSIONS
+
class ExtractThumbnail(pyblish.api.InstancePlugin):
"""Create jpg thumbnail from sequence using ffmpeg"""
@@ -22,14 +28,49 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
"imagesequence", "render", "render2d", "prerender",
"source", "clip", "take", "online", "image"
]
- hosts = ["shell", "fusion", "resolve", "traypublisher", "substancepainter"]
+ hosts = [
+ "shell",
+ "fusion",
+ "resolve",
+ "traypublisher",
+ "substancepainter",
+ "nuke",
+ ]
enabled = False
+ integrate_thumbnail = False
+ target_size = {
+ "type": "resize",
+ "width": 1920,
+ "height": 1080
+ }
+ background_color = None
+ duration_split = 0.5
# attribute presets from settings
oiiotool_defaults = None
ffmpeg_args = None
def process(self, instance):
+ # run main process
+ self._main_process(instance)
+
+ # Make sure cleanup happens to representations which are having both
+ # tags `delete` and `need_thumbnail`
+ for repre in tuple(instance.data.get("representations", [])):
+ tags = repre.get("tags") or []
+ # skip representations which are going to be published on farm
+ if "publish_on_farm" in tags:
+ continue
+ if (
+ "delete" in tags
+ and "need_thumbnail" in tags
+ ):
+ self.log.debug(
+ "Removing representation: {}".format(repre)
+ )
+ instance.data["representations"].remove(repre)
+
+ def _main_process(self, instance):
subset_name = instance.data["subset"]
instance_repres = instance.data.get("representations")
if not instance_repres:
@@ -62,7 +103,13 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
self.log.debug("Skipping crypto passes.")
return
- filtered_repres = self._get_filtered_repres(instance)
+ # first check for any explicitly marked representations for thumbnail
+ explicit_repres = self._get_explicit_repres_for_thumbnail(instance)
+ if explicit_repres:
+ filtered_repres = explicit_repres
+ else:
+ filtered_repres = self._get_filtered_repres(instance)
+
if not filtered_repres:
self.log.info(
"Instance doesn't have representations that can be used "
@@ -83,15 +130,39 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
oiio_supported = is_oiio_supported()
for repre in filtered_repres:
repre_files = repre["files"]
+ src_staging = os.path.normpath(repre["stagingDir"])
if not isinstance(repre_files, (list, tuple)):
- input_file = repre_files
+ # convert any video file to frame so oiio doesn't need to
+ # read video file (it is slow) and also we are having control
+ # over which frame is used for thumbnail
+ # this will also work with ffmpeg fallback conversion in case
+ # oiio is not supported
+ repre_extension = os.path.splitext(repre_files)[1]
+ if repre_extension in VIDEO_EXTENSIONS:
+ video_file_path = os.path.join(
+ src_staging, repre_files
+ )
+ file_path = self._create_frame_from_video(
+ video_file_path,
+ dst_staging
+ )
+ if file_path:
+ src_staging, input_file = os.path.split(file_path)
+ else:
+ # if it is not video file then just use first file
+ input_file = repre_files
else:
- file_index = int(float(len(repre_files)) * 0.5)
+ repre_files_thumb = copy.deepcopy(repre_files)
+ # exclude first frame if slate in representation tags
+ if "slate-frame" in repre.get("tags", []):
+ repre_files_thumb = repre_files_thumb[1:]
+ file_index = int(
+ float(len(repre_files_thumb)) * self.duration_split)
input_file = repre_files[file_index]
- src_staging = os.path.normpath(repre["stagingDir"])
full_input_path = os.path.join(src_staging, input_file)
self.log.debug("input {}".format(full_input_path))
+
filename = os.path.splitext(input_file)[0]
jpeg_file = filename + "_thumb.jpg"
full_output_path = os.path.join(dst_staging, jpeg_file)
@@ -106,7 +177,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
)
# If the input can read by OIIO then use OIIO method for
# conversion otherwise use ffmpeg
- thumbnail_created = self.create_thumbnail_oiio(
+ thumbnail_created = self._create_thumbnail_oiio(
full_input_path,
full_output_path,
colorspace_data
@@ -122,7 +193,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
" can't be read by OIIO."
)
- thumbnail_created = self.create_thumbnail_ffmpeg(
+ thumbnail_created = self._create_thumbnail_ffmpeg(
full_input_path, full_output_path
)
@@ -130,22 +201,55 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
if not thumbnail_created:
continue
+ if len(explicit_repres) > 1:
+ repre_name = "thumbnail_{}".format(repre["outputName"])
+ else:
+ repre_name = "thumbnail"
+
+ # add thumbnail path to instance data for integrator
+ instance_thumb_path = instance.data.get("thumbnailPath")
+ if (
+ not instance_thumb_path
+ or not os.path.isfile(instance_thumb_path)
+ ):
+ self.log.debug(
+ "Adding thumbnail path to instance data: {}".format(
+ full_output_path
+ )
+ )
+ instance.data["thumbnailPath"] = full_output_path
+
+ new_repre_tags = ["thumbnail"]
+ # for workflows which needs to have thumbnails published as
+ # separate representations `delete` tag should not be added
+ if not self.integrate_thumbnail:
+ new_repre_tags.append("delete")
+
new_repre = {
- "name": "thumbnail",
+ "name": repre_name,
"ext": "jpg",
"files": jpeg_file,
"stagingDir": dst_staging,
"thumbnail": True,
- "tags": ["thumbnail"]
+ "tags": new_repre_tags
}
# adding representation
- self.log.debug(
- "Adding thumbnail representation: {}".format(new_repre)
- )
instance.data["representations"].append(new_repre)
- # There is no need to create more then one thumbnail
- break
+
+ if explicit_repres:
+ # this key will then align assetVersion ftrack thumbnail sync
+ new_repre["outputName"] = (
+ repre.get("outputName") or repre["name"])
+ self.log.debug(
+ "Adding explicit thumbnail representation: {}".format(
+ new_repre))
+ else:
+ self.log.debug(
+ "Adding thumbnail representation: {}".format(new_repre)
+ )
+ # There is no need to create more then one thumbnail
+ break
if not thumbnail_created:
self.log.warning("Thumbnail has not been created.")
@@ -164,12 +268,42 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
return True
return False
+ def _get_explicit_repres_for_thumbnail(self, instance):
+ src_repres = instance.data.get("representations") or []
+ # This is mainly for Nuke where we have multiple representations for
+ # one instance and representations are tagged for thumbnail.
+ # First check if any of the representations have
+ # `need_thumbnail` in tags and add them to filtered_repres
+ need_thumb_repres = [
+ repre for repre in src_repres
+ if "need_thumbnail" in repre.get("tags", [])
+ if "publish_on_farm" not in repre.get("tags", [])
+ ]
+ if not need_thumb_repres:
+ return []
+
+ self.log.info(
+ "Instance has representation with tag `need_thumbnail`. "
+ "Using only this representations for thumbnail creation. "
+ )
+ self.log.debug(
+ "Representations: {}".format(need_thumb_repres)
+ )
+ return need_thumb_repres
+
def _get_filtered_repres(self, instance):
filtered_repres = []
src_repres = instance.data.get("representations") or []
+
for repre in src_repres:
self.log.debug(repre)
tags = repre.get("tags") or []
+
+ if "publish_on_farm" in tags:
+ # only process representations with are going
+ # to be published locally
+ continue
+
valid = "review" in tags or "thumb-nuke" in tags
if not valid:
continue
@@ -183,7 +317,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
filtered_repres.append(repre)
return filtered_repres
- def create_thumbnail_oiio(
+ def _create_thumbnail_oiio(
self,
src_path,
dst_path,
@@ -205,6 +339,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
str: path to created thumbnail
"""
self.log.info("Extracting thumbnail {}".format(dst_path))
+ resolution_arg = self._get_resolution_arg("oiiotool", src_path)
repre_display = colorspace_data.get("display")
repre_view = colorspace_data.get("view")
@@ -241,6 +376,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
display=repre_display or oiio_default_display,
view=repre_view or oiio_default_view,
target_colorspace=oiio_default_colorspace,
+ additional_command_args=resolution_arg,
logger=self.log,
)
except Exception:
@@ -252,9 +388,9 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
return True
- def create_thumbnail_ffmpeg(self, src_path, dst_path):
+ def _create_thumbnail_ffmpeg(self, src_path, dst_path):
self.log.debug("Extracting thumbnail with FFMPEG: {}".format(dst_path))
-
+ resolution_arg = self._get_resolution_arg("ffmpeg", src_path)
ffmpeg_path_args = get_ffmpeg_tool_args("ffmpeg")
ffmpeg_args = self.ffmpeg_args or {}
@@ -276,6 +412,10 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
jpeg_items.extend(ffmpeg_args.get("output") or [])
# we just want one frame from movie files
jpeg_items.extend(["-vframes", "1"])
+
+ if resolution_arg:
+ jpeg_items.extend(resolution_arg)
+
# output file
jpeg_items.append(path_to_subprocess_arg(dst_path))
subprocess_command = " ".join(jpeg_items)
@@ -290,3 +430,69 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
exc_info=True
)
return False
+
+ def _create_frame_from_video(self, video_file_path, output_dir):
+ """Convert video file to one frame image via ffmpeg"""
+ # create output file path
+ base_name = os.path.basename(video_file_path)
+ filename = os.path.splitext(base_name)[0]
+ output_thumb_file_path = os.path.join(
+ output_dir, "{}.png".format(filename))
+
+ # Set video input attributes
+ max_int = str(2147483647)
+ video_data = get_ffprobe_data(video_file_path, logger=self.log)
+ duration = float(video_data["format"]["duration"])
+
+ cmd_args = [
+ "-y",
+ "-ss", str(duration * self.duration_split),
+ "-i", video_file_path,
+ "-analyzeduration", max_int,
+ "-probesize", max_int,
+ "-vframes", "1"
+ ]
+
+ # add output file path
+ cmd_args.append(output_thumb_file_path)
+
+ # create ffmpeg command
+ cmd = get_ffmpeg_tool_args(
+ "ffmpeg",
+ *cmd_args
+ )
+ try:
+ # run subprocess
+ self.log.debug("Executing: {}".format(" ".join(cmd)))
+ run_subprocess(cmd, logger=self.log)
+ self.log.debug(
+ "Thumbnail created: {}".format(output_thumb_file_path))
+ return output_thumb_file_path
+ except RuntimeError as error:
+ self.log.warning(
+ "Failed intermediate thumb source using ffmpeg: {}".format(
+ error)
+ )
+ return None
+
+ def _get_resolution_arg(
+ self,
+ application,
+ input_path,
+ ):
+ # get settings
+ if self.target_size.get("type") == "source":
+ return []
+
+ target_width = self.target_size["width"]
+ target_height = self.target_size["height"]
+
+ # form arg string per application
+ return get_rescaled_command_arguments(
+ application,
+ input_path,
+ target_width,
+ target_height,
+ bg_color=self.background_color,
+ log=self.log
+ )
diff --git a/openpype/plugins/publish/integrate.py b/openpype/plugins/publish/integrate.py
index 5bb51a3049..581c0c012f 100644
--- a/openpype/plugins/publish/integrate.py
+++ b/openpype/plugins/publish/integrate.py
@@ -137,7 +137,6 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
"mvUsd",
"mvUsdComposition",
"mvUsdOverride",
- "simpleUnrealTexture",
"online",
"uasset",
"blendScene",
diff --git a/openpype/plugins/publish/integrate_thumbnail_ayon.py b/openpype/plugins/publish/integrate_thumbnail_ayon.py
index f9b48eebec..e56c567667 100644
--- a/openpype/plugins/publish/integrate_thumbnail_ayon.py
+++ b/openpype/plugins/publish/integrate_thumbnail_ayon.py
@@ -5,7 +5,21 @@
pull into a scene.
This one is used only as image describing content of published item and
- shows up only in Loader in right column section.
+ shows up only in Loader or WebUI.
+
+ Instance must have 'published_representations' to
+ be able to integrate thumbnail.
+ Possible sources of thumbnail paths:
+ - instance.data["thumbnailPath"]
+ - representation with 'thumbnail' name in 'published_representations'
+ - context.data["thumbnailPath"]
+
+ Notes:
+ Issue with 'thumbnail' representation is that we most likely don't
+ want to integrate it as representation. Integrated representation
+ is polluting Loader and database without real usage. That's why
+ they usually have 'delete' tag to skip the integration.
+
"""
import os
@@ -72,7 +86,7 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
)
def _prepare_instances(self, context):
- context_thumbnail_path = context.get("thumbnailPath")
+ context_thumbnail_path = context.data.get("thumbnailPath")
valid_context_thumbnail = bool(
context_thumbnail_path
and os.path.exists(context_thumbnail_path)
@@ -92,8 +106,10 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
continue
# Find thumbnail path on instance
- thumbnail_path = self._get_instance_thumbnail_path(
- published_repres)
+ thumbnail_path = (
+ instance.data.get("thumbnailPath")
+ or self._get_instance_thumbnail_path(published_repres)
+ )
if thumbnail_path:
self.log.debug((
"Found thumbnail path for instance \"{}\"."
@@ -131,7 +147,7 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
thumb_repre_doc = None
for repre_info in published_representations.values():
repre_doc = repre_info["representation"]
- if repre_doc["name"].lower() == "thumbnail":
+ if "thumbnail" in repre_doc["name"].lower():
thumb_repre_doc = repre_doc
break
@@ -157,8 +173,8 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
):
from openpype.client.server.operations import create_thumbnail
- op_session = OperationsSession()
-
+ # Make sure each entity id has defined only one thumbnail id
+ thumbnail_info_by_entity_id = {}
for instance_item in filtered_instance_items:
instance, thumbnail_path, version_id = instance_item
instance_label = self._get_instance_label(instance)
@@ -172,12 +188,10 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
thumbnail_id = create_thumbnail(project_name, thumbnail_path)
# Set thumbnail id for version
- op_session.update_entity(
- project_name,
- version_doc["type"],
- version_doc["_id"],
- {"data.thumbnail_id": thumbnail_id}
- )
+ thumbnail_info_by_entity_id[version_id] = {
+ "thumbnail_id": thumbnail_id,
+ "entity_type": version_doc["type"],
+ }
if version_doc["type"] == "hero_version":
version_name = "Hero"
else:
@@ -187,16 +201,23 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
))
asset_entity = instance.data["assetEntity"]
- op_session.update_entity(
- project_name,
- asset_entity["type"],
- asset_entity["_id"],
- {"data.thumbnail_id": thumbnail_id}
- )
+ thumbnail_info_by_entity_id[asset_entity["_id"]] = {
+ "thumbnail_id": thumbnail_id,
+ "entity_type": "asset",
+ }
self.log.debug("Setting thumbnail for asset \"{}\" <{}>".format(
asset_entity["name"], version_id
))
+ op_session = OperationsSession()
+ for entity_id, thumbnail_info in thumbnail_info_by_entity_id.items():
+ thumbnail_id = thumbnail_info["thumbnail_id"]
+ op_session.update_entity(
+ project_name,
+ thumbnail_info["entity_type"],
+ entity_id,
+ {"data.thumbnail_id": thumbnail_id}
+ )
op_session.commit()
def _get_instance_label(self, instance):
diff --git a/openpype/pype_commands.py b/openpype/pype_commands.py
index b5828d3dfe..f744337c67 100644
--- a/openpype/pype_commands.py
+++ b/openpype/pype_commands.py
@@ -185,7 +185,7 @@ class PypeCommands:
task,
app,
env_group=env_group,
- launch_type=LaunchTypes.farm_render,
+ launch_type=LaunchTypes.farm_render
)
else:
env = os.environ.copy()
@@ -214,7 +214,7 @@ class PypeCommands:
def run_tests(self, folder, mark, pyargs,
test_data_folder, persist, app_variant, timeout, setup_only,
- mongo_url, app_group):
+ mongo_url, app_group, dump_databases):
"""
Runs tests from 'folder'
@@ -275,6 +275,13 @@ class PypeCommands:
if mongo_url:
args.extend(["--mongo_url", mongo_url])
+ if dump_databases:
+ msg = "dump_databases format is not recognized: {}".format(
+ dump_databases
+ )
+ assert dump_databases in ["bson", "json"], msg
+ args.extend(["--dump_databases", dump_databases])
+
print("run_tests args: {}".format(args))
import pytest
pytest.main(args)
diff --git a/openpype/resources/__init__.py b/openpype/resources/__init__.py
index b33d1bf023..c429fb8c3e 100644
--- a/openpype/resources/__init__.py
+++ b/openpype/resources/__init__.py
@@ -1,6 +1,6 @@
import os
from openpype import AYON_SERVER_ENABLED
-from openpype.lib.openpype_version import is_running_staging
+from openpype.lib.openpype_version import is_staging_enabled
RESOURCES_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -59,7 +59,7 @@ def get_openpype_icon_filepath(staging=None):
return get_resource("icons", "AYON_icon_dev.png")
if staging is None:
- staging = is_running_staging()
+ staging = is_staging_enabled()
if staging:
return get_openpype_staging_icon_filepath()
@@ -68,7 +68,7 @@ def get_openpype_icon_filepath(staging=None):
def get_openpype_splash_filepath(staging=None):
if staging is None:
- staging = is_running_staging()
+ staging = is_staging_enabled()
if AYON_SERVER_ENABLED:
if os.getenv("AYON_USE_DEV") == "1":
diff --git a/openpype/resources/app_icons/wrap.png b/openpype/resources/app_icons/wrap.png
new file mode 100644
index 0000000000..34ae1d68ed
Binary files /dev/null and b/openpype/resources/app_icons/wrap.png differ
diff --git a/openpype/settings/ayon_settings.py b/openpype/settings/ayon_settings.py
index 6676e71a8e..222ce68c0f 100644
--- a/openpype/settings/ayon_settings.py
+++ b/openpype/settings/ayon_settings.py
@@ -572,6 +572,27 @@ def _convert_maya_project_settings(ayon_settings, output):
for item in viewport_options["pluginObjects"]
}
+ ayon_playblast_settings = ayon_publish["ExtractPlayblast"]["profiles"]
+ if ayon_playblast_settings:
+ for setting in ayon_playblast_settings:
+ capture_preset = setting["capture_preset"]
+ display_options = capture_preset["DisplayOptions"]
+ for key in ("background", "backgroundBottom", "backgroundTop"):
+ display_options[key] = _convert_color(display_options[key])
+
+ for src_key, dst_key in (
+ ("DisplayOptions", "Display Options"),
+ ("ViewportOptions", "Viewport Options"),
+ ("CameraOptions", "Camera Options"),
+ ):
+ capture_preset[dst_key] = capture_preset.pop(src_key)
+
+ viewport_options = capture_preset["Viewport Options"]
+ viewport_options["pluginObjects"] = {
+ item["name"]: item["value"]
+ for item in viewport_options["pluginObjects"]
+ }
+
# Extract Camera Alembic bake attributes
try:
bake_attributes = json.loads(
@@ -821,28 +842,6 @@ def _convert_nuke_project_settings(ayon_settings, output):
collect_instance_data.pop(
"sync_workfile_version_on_product_types"))
- # TODO 'ExtractThumbnail' does not have ideal schema in v3
- ayon_extract_thumbnail = ayon_publish["ExtractThumbnail"]
- new_thumbnail_nodes = {}
- for item in ayon_extract_thumbnail["nodes"]:
- name = item["nodeclass"]
- value = []
- for knob in _convert_nuke_knobs(item["knobs"]):
- knob_name = knob["name"]
- # This may crash
- if knob["type"] == "expression":
- knob_value = knob["expression"]
- else:
- knob_value = knob["value"]
- value.append([knob_name, knob_value])
- new_thumbnail_nodes[name] = value
-
- ayon_extract_thumbnail["nodes"] = new_thumbnail_nodes
-
- if "reposition_nodes" in ayon_extract_thumbnail:
- for item in ayon_extract_thumbnail["reposition_nodes"]:
- item["knobs"] = _convert_nuke_knobs(item["knobs"])
-
# --- ImageIO ---
# NOTE 'monitorOutLut' is maybe not yet in v3 (ut should be)
_convert_host_imageio(ayon_nuke)
@@ -1241,6 +1240,26 @@ def _convert_global_project_settings(ayon_settings, output, default_settings):
profile["outputs"] = new_outputs
+ # ExtractThumbnail plugin
+ ayon_extract_thumbnail = ayon_publish["ExtractThumbnail"]
+ # fix display and view at oiio defaults
+ ayon_default_oiio = copy.deepcopy(
+ ayon_extract_thumbnail["oiiotool_defaults"])
+ display_and_view = ayon_default_oiio.pop("display_and_view")
+ ayon_default_oiio["display"] = display_and_view["display"]
+ ayon_default_oiio["view"] = display_and_view["view"]
+ ayon_extract_thumbnail["oiiotool_defaults"] = ayon_default_oiio
+ # fix target size
+ ayon_default_resize = copy.deepcopy(ayon_extract_thumbnail["target_size"])
+ resize = ayon_default_resize.pop("resize")
+ ayon_default_resize["width"] = resize["width"]
+ ayon_default_resize["height"] = resize["height"]
+ ayon_extract_thumbnail["target_size"] = ayon_default_resize
+ # fix background color
+ ayon_extract_thumbnail["background_color"] = _convert_color(
+ ayon_extract_thumbnail["background_color"]
+ )
+
# ExtractOIIOTranscode plugin
extract_oiio_transcode = ayon_publish["ExtractOIIOTranscode"]
extract_oiio_transcode_profiles = extract_oiio_transcode["profiles"]
diff --git a/openpype/settings/defaults/project_anatomy/templates.json b/openpype/settings/defaults/project_anatomy/templates.json
index 5766a09100..6c3e038d27 100644
--- a/openpype/settings/defaults/project_anatomy/templates.json
+++ b/openpype/settings/defaults/project_anatomy/templates.json
@@ -38,16 +38,6 @@
"file": "{subset}_{@version}<_{output}><.{@frame}>.{ext}",
"path": "{@folder}/{@file}"
},
- "simpleUnrealTextureHero": {
- "folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/hero",
- "file": "{originalBasename}.{ext}",
- "path": "{@folder}/{@file}"
- },
- "simpleUnrealTexture": {
- "folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{@version}",
- "file": "{originalBasename}_{@version}.{ext}",
- "path": "{@folder}/{@file}"
- },
"online": {
"folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}",
"file": "{originalBasename}<.{@frame}><_{udim}>.{ext}",
@@ -68,8 +58,6 @@
},
"__dynamic_keys_labels__": {
"maya2unreal": "Maya to Unreal",
- "simpleUnrealTextureHero": "Simple Unreal Texture - Hero",
- "simpleUnrealTexture": "Simple Unreal Texture",
"online": "online",
"tycache": "tycache",
"source": "source",
diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json
index a1df8ccba9..a19464a5c1 100644
--- a/openpype/settings/defaults/project_settings/deadline.json
+++ b/openpype/settings/defaults/project_settings/deadline.json
@@ -107,7 +107,8 @@
"use_published": true,
"priority": 50,
"chunk_size": 10,
- "group": "none"
+ "group": "none",
+ "job_delay": "00:00:00:00"
},
"ProcessSubmittedCacheJobOnFarm": {
"enabled": true,
diff --git a/openpype/settings/defaults/project_settings/fusion.json b/openpype/settings/defaults/project_settings/fusion.json
index ab24727db5..0edcae060a 100644
--- a/openpype/settings/defaults/project_settings/fusion.json
+++ b/openpype/settings/defaults/project_settings/fusion.json
@@ -25,7 +25,8 @@
"instance_attributes": [
"reviewable",
"farm_rendering"
- ]
+ ],
+ "image_format": "exr"
}
},
"publish": {
diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json
index 959faf14fa..bb7e3266bd 100644
--- a/openpype/settings/defaults/project_settings/global.json
+++ b/openpype/settings/defaults/project_settings/global.json
@@ -70,6 +70,19 @@
},
"ExtractThumbnail": {
"enabled": true,
+ "integrate_thumbnail": false,
+ "background_color": [
+ 0,
+ 0,
+ 0,
+ 255
+ ],
+ "duration_split": 0.5,
+ "target_size": {
+ "type": "resize",
+ "width": 1920,
+ "height": 1080
+ },
"oiiotool_defaults": {
"type": "colorspace",
"colorspace": "color_picking",
@@ -322,22 +335,9 @@
"animation",
"setdress",
"layout",
- "mayaScene",
- "simpleUnrealTexture"
+ "mayaScene"
],
- "template_name_profiles": [
- {
- "families": [
- "simpleUnrealTexture"
- ],
- "hosts": [
- "standalonepublisher"
- ],
- "task_types": [],
- "task_names": [],
- "template_name": "simpleUnrealTextureHero"
- }
- ]
+ "template_name_profiles": []
},
"CleanUp": {
"paterns": [],
@@ -519,17 +519,6 @@
"task_names": [],
"template_name": "render"
},
- {
- "families": [
- "simpleUnrealTexture"
- ],
- "hosts": [
- "standalonepublisher"
- ],
- "task_types": [],
- "task_names": [],
- "template_name": "simpleUnrealTexture"
- },
{
"families": [
"staticMesh",
@@ -565,19 +554,7 @@
"template_name": "tycache"
}
],
- "hero_template_name_profiles": [
- {
- "families": [
- "simpleUnrealTexture"
- ],
- "hosts": [
- "standalonepublisher"
- ],
- "task_types": [],
- "task_names": [],
- "template_name": "simpleUnrealTextureHero"
- }
- ],
+ "hero_template_name_profiles": [],
"custom_staging_dir_profiles": []
}
},
diff --git a/openpype/settings/defaults/project_settings/houdini.json b/openpype/settings/defaults/project_settings/houdini.json
index 0001b23967..813e7153ea 100644
--- a/openpype/settings/defaults/project_settings/houdini.json
+++ b/openpype/settings/defaults/project_settings/houdini.json
@@ -62,6 +62,12 @@
"Main"
]
},
+ "CreateMantraIFD": {
+ "enabled": true,
+ "default_variants": [
+ "Main"
+ ]
+ },
"CreateMantraROP": {
"enabled": true,
"default_variants": [
@@ -137,14 +143,14 @@
}
},
"publish": {
+ "CollectAssetHandles": {
+ "use_asset_handles": true
+ },
"CollectChunkSize": {
"enabled": true,
"optional": true,
"chunk_size": 999999
},
- "CollectAssetHandles": {
- "use_asset_handles": true
- },
"ValidateContainers": {
"enabled": true,
"optional": true,
diff --git a/openpype/settings/defaults/project_settings/max.json b/openpype/settings/defaults/project_settings/max.json
index 97fcf69e31..19c9d10496 100644
--- a/openpype/settings/defaults/project_settings/max.json
+++ b/openpype/settings/defaults/project_settings/max.json
@@ -56,6 +56,31 @@
"enabled": false,
"optional": true,
"family_plugins_mapping": []
+ },
+ "ExtractModelObj": {
+ "enabled": true,
+ "optional": true,
+ "active": false
+ },
+ "ExtractModelFbx": {
+ "enabled": true,
+ "optional": true,
+ "active": false
+ },
+ "ExtractModelUSD": {
+ "enabled": true,
+ "optional": true,
+ "active": false
+ },
+ "ExtractModel": {
+ "enabled": true,
+ "optional": true,
+ "active": true
+ },
+ "ExtractMaxSceneRaw": {
+ "enabled": true,
+ "optional": true,
+ "active": true
}
}
}
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 7719a5e255..34452eb8ce 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -436,7 +436,7 @@
"viewTransform": "sRGB gamma"
}
},
- "mel_workspace": "workspace -fr \"shaders\" \"renderData/shaders\";\nworkspace -fr \"images\" \"renders/maya\";\nworkspace -fr \"particles\" \"particles\";\nworkspace -fr \"mayaAscii\" \"\";\nworkspace -fr \"mayaBinary\" \"\";\nworkspace -fr \"scene\" \"\";\nworkspace -fr \"alembicCache\" \"cache/alembic\";\nworkspace -fr \"renderData\" \"renderData\";\nworkspace -fr \"sourceImages\" \"sourceimages\";\nworkspace -fr \"fileCache\" \"cache/nCache\";\n",
+ "mel_workspace": "workspace -fr \"shaders\" \"renderData/shaders\";\nworkspace -fr \"images\" \"renders/maya\";\nworkspace -fr \"particles\" \"particles\";\nworkspace -fr \"mayaAscii\" \"\";\nworkspace -fr \"mayaBinary\" \"\";\nworkspace -fr \"scene\" \"\";\nworkspace -fr \"alembicCache\" \"cache/alembic\";\nworkspace -fr \"renderData\" \"renderData\";\nworkspace -fr \"sourceImages\" \"sourceimages\";\nworkspace -fr \"fileCache\" \"cache/nCache\";\nworkspace -fr \"autoSave\" \"autosave\";",
"ext_mapping": {
"model": "ma",
"mayaAscii": "ma",
diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json
index 20df0ad5c2..17932c793d 100644
--- a/openpype/settings/defaults/project_settings/nuke.json
+++ b/openpype/settings/defaults/project_settings/nuke.json
@@ -379,68 +379,6 @@
"optional": true,
"active": true
},
- "ExtractThumbnail": {
- "enabled": true,
- "use_rendered": true,
- "bake_viewer_process": true,
- "bake_viewer_input_process": true,
- "nodes": {
- "Reformat": [
- [
- "type",
- "to format"
- ],
- [
- "format",
- "HD_1080"
- ],
- [
- "filter",
- "Lanczos6"
- ],
- [
- "black_outside",
- true
- ],
- [
- "pbb",
- false
- ]
- ]
- },
- "reposition_nodes": [
- {
- "node_class": "Reformat",
- "knobs": [
- {
- "type": "text",
- "name": "type",
- "value": "to format"
- },
- {
- "type": "text",
- "name": "format",
- "value": "HD_1080"
- },
- {
- "type": "text",
- "name": "filter",
- "value": "Lanczos6"
- },
- {
- "type": "bool",
- "name": "black_outside",
- "value": true
- },
- {
- "type": "bool",
- "name": "pbb",
- "value": false
- }
- ]
- }
- ]
- },
"ExtractReviewData": {
"enabled": false
},
diff --git a/openpype/settings/defaults/project_settings/standalonepublisher.json b/openpype/settings/defaults/project_settings/standalonepublisher.json
index d923b4db43..44982133eb 100644
--- a/openpype/settings/defaults/project_settings/standalonepublisher.json
+++ b/openpype/settings/defaults/project_settings/standalonepublisher.json
@@ -133,14 +133,6 @@
],
"help": "Texture files with UDIM together with worfile"
},
- "create_simple_unreal_texture": {
- "name": "simple_unreal_texture",
- "label": "Simple Unreal Texture",
- "family": "simpleUnrealTexture",
- "icon": "Image",
- "defaults": [],
- "help": "Texture files with Unreal naming convention"
- },
"create_vdb": {
"name": "vdb",
"label": "VDB Volumetric Data",
diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json
index e13de11414..7d2f358cb2 100644
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@@ -244,19 +244,6 @@
".hda"
]
},
- {
- "family": "simpleUnrealTexture",
- "identifier": "",
- "label": "Simple UE texture",
- "icon": "fa.image",
- "default_variants": [],
- "description": "Simple Unreal Engine texture",
- "detailed_description": "Texture files with Unreal Engine naming conventions",
- "allow_sequences": false,
- "allow_multiple_items": true,
- "allow_version_control": false,
- "extensions": []
- },
{
"family": "audio",
"identifier": "",
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 e622dc43a2..1aea778e32 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
@@ -581,6 +581,11 @@
"type": "text",
"key": "group",
"label": "Group Name"
+ },
+ {
+ "type": "text",
+ "key": "job_delay",
+ "label": "Delay job (timecode dd:hh:mm:ss)"
}
]
},
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json b/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json
index 342411f8a5..5177d8bc7c 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json
@@ -80,6 +80,19 @@
"farm_rendering": "Farm rendering"
}
]
+ },
+ {
+ "key": "image_format",
+ "label": "Output Image Format",
+ "type": "enum",
+ "multiselect": false,
+ "enum_items": [
+ {"exr": "exr"},
+ {"tga": "tga"},
+ {"png": "png"},
+ {"tif": "tif"},
+ {"jpg": "jpg"}
+ ]
}
]
}
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
index a850cb68ed..ac2d9e190d 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
@@ -202,6 +202,72 @@
"key": "enabled",
"label": "Enabled"
},
+ {
+ "type": "boolean",
+ "key": "integrate_thumbnail",
+ "label": "Integrate thumbnail as representation"
+ },
+ {
+ "type": "dict-conditional",
+ "use_label_wrap": false,
+ "collapsible": false,
+ "key": "target_size",
+ "label": "Target size",
+ "enum_key": "type",
+ "enum_label": "Type",
+ "enum_children": [
+ {
+ "key": "source",
+ "label": "Image source",
+ "children": [
+ {
+ "type": "label",
+ "label": "Image size will be inherited from source image."
+ }
+ ]
+ },
+ {
+ "key": "resize",
+ "label": "Resize",
+ "children": [
+ {
+ "type": "label",
+ "label": "Image will be resized to specified size."
+ },
+ {
+ "type": "number",
+ "key": "width",
+ "label": "Width",
+ "decimal": 0,
+ "minimum": 0,
+ "maximum": 99999
+ },
+ {
+ "type": "number",
+ "key": "height",
+ "label": "Height",
+ "decimal": 0,
+ "minimum": 0,
+ "maximum": 99999
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "color",
+ "label": "Background color",
+ "key": "background_color"
+ },
+ {
+ "key": "duration_split",
+ "label": "Duration split ratio",
+ "type": "number",
+ "decimal": 1,
+ "default": 0.5,
+ "minimum": 0,
+ "maximum": 1
+ },
{
"type": "dict",
"collapsible": true,
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_create.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_create.json
index f37738c4ec..213ec9d04e 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_create.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_create.json
@@ -69,6 +69,10 @@
"key": "CreateKarmaROP",
"label": "Create Karma ROP"
},
+ {
+ "key": "CreateMantraIFD",
+ "label": "Create Mantra IFD"
+ },
{
"key": "CreateMantraROP",
"label": "Create Mantra ROP"
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_publish.json
index 935c2a4c35..aaaf4311b7 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_publish.json
@@ -25,6 +25,31 @@
}
]
},
+ {
+ "type": "dict",
+ "collapsible": true,
+ "checkbox_key": "enabled",
+ "key": "CollectChunkSize",
+ "label": "Collect Chunk Size",
+ "is_group": true,
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "boolean",
+ "key": "optional",
+ "label": "Optional"
+ },
+ {
+ "type": "number",
+ "key": "chunk_size",
+ "label": "Frames Per Task"
+ }
+ ]
+ },
{
"type": "label",
"label": "Validators"
@@ -55,31 +80,6 @@
}
]
},
- {
- "type": "dict",
- "collapsible": true,
- "checkbox_key": "enabled",
- "key": "CollectChunkSize",
- "label": "Collect Chunk Size",
- "is_group": true,
- "children": [
- {
- "type": "boolean",
- "key": "enabled",
- "label": "Enabled"
- },
- {
- "type": "boolean",
- "key": "optional",
- "label": "Optional"
- },
- {
- "type": "number",
- "key": "chunk_size",
- "label": "Frames Per Task"
- }
- ]
- },
{
"type": "dict",
"collapsible": true,
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_max_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_max_publish.json
index c6d37ae993..b4d85bda98 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_max_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_max_publish.json
@@ -90,6 +90,131 @@
}
}
]
+ },
+ {
+ "type": "dict",
+ "collapsible": true,
+ "checkbox_key": "enabled",
+ "key": "ExtractModelObj",
+ "label": "Extract Obj",
+ "is_group": true,
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "boolean",
+ "key": "optional",
+ "label": "Optional"
+ },
+ {
+ "type": "boolean",
+ "key": "active",
+ "label": "Active"
+ }
+ ]
+ },
+ {
+ "type": "dict",
+ "collapsible": true,
+ "checkbox_key": "enabled",
+ "key": "ExtractModelFbx",
+ "label": "Extract FBX",
+ "is_group": true,
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "boolean",
+ "key": "optional",
+ "label": "Optional"
+ },
+ {
+ "type": "boolean",
+ "key": "active",
+ "label": "Active"
+ }
+ ]
+ },
+ {
+ "type": "dict",
+ "collapsible": true,
+ "checkbox_key": "enabled",
+ "key": "ExtractModelUSD",
+ "label": "Extract Geometry (USD)",
+ "is_group": true,
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "boolean",
+ "key": "optional",
+ "label": "Optional"
+ },
+ {
+ "type": "boolean",
+ "key": "active",
+ "label": "Active"
+ }
+ ]
+ },
+ {
+ "type": "dict",
+ "collapsible": true,
+ "checkbox_key": "enabled",
+ "key": "ExtractModel",
+ "label": "Extract Geometry (Alembic)",
+ "is_group": true,
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "boolean",
+ "key": "optional",
+ "label": "Optional"
+ },
+ {
+ "type": "boolean",
+ "key": "active",
+ "label": "Active"
+ }
+ ]
+ },
+ {
+ "type": "dict",
+ "collapsible": true,
+ "checkbox_key": "enabled",
+ "key": "ExtractMaxSceneRaw",
+ "label": "Extract Max Scene (Raw)",
+ "is_group": true,
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "boolean",
+ "key": "optional",
+ "label": "Optional"
+ },
+ {
+ "type": "boolean",
+ "key": "active",
+ "label": "Active"
+ }
+ ]
}
]
}
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json
index e0cd086119..09b67e7d1a 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json
@@ -125,81 +125,6 @@
"type": "label",
"label": "Extractors"
},
- {
- "type": "dict",
- "collapsible": true,
- "checkbox_key": "enabled",
- "key": "ExtractThumbnail",
- "label": "ExtractThumbnail",
- "is_group": true,
- "children": [
- {
- "type": "boolean",
- "key": "enabled",
- "label": "Enabled"
- },
- {
- "type": "boolean",
- "key": "use_rendered",
- "label": "Use rendered images"
- },
- {
- "type": "boolean",
- "key": "bake_viewer_process",
- "label": "Bake viewer process"
- },
- {
- "type": "boolean",
- "key": "bake_viewer_input_process",
- "label": "Bake viewer input process"
- },
- {
- "type": "collapsible-wrap",
- "label": "Nodes",
- "collapsible": true,
- "children": [
- {
- "type": "label",
- "label": "Nodes attribute will be deprecated in future releases. Use reposition_nodes instead."
- },
- {
- "type": "raw-json",
- "key": "nodes",
- "label": "Nodes [depricated]"
- },
- {
- "type": "label",
- "label": "Reposition knobs supported only. You can add multiple reformat nodes
and set their knobs. Order of reformat nodes is important. First reformat node
will be applied first and last reformat node will be applied last."
- },
- {
- "key": "reposition_nodes",
- "type": "list",
- "label": "Reposition nodes",
- "object_type": {
- "type": "dict",
- "children": [
- {
- "key": "node_class",
- "label": "Node class",
- "type": "text"
- },
- {
- "type": "schema_template",
- "name": "template_nuke_knob_inputs",
- "template_data": [
- {
- "label": "Node knobs",
- "key": "knobs"
- }
- ]
- }
- ]
- }
- }
- ]
- }
- ]
- },
{
"type": "dict",
"collapsible": true,
diff --git a/openpype/style/style.css b/openpype/style/style.css
index ca368f84f8..f6ecebd683 100644
--- a/openpype/style/style.css
+++ b/openpype/style/style.css
@@ -512,52 +512,58 @@ QAbstractItemView::item:selected:hover {
}
/* Row colors (alternate colors) are from left - right */
-QAbstractItemView:branch {
- background: transparent;
+QTreeView::branch {
+ background: {color:bg-view};
+}
+QTreeView::branch:hover {
+ background: {color:bg-view};
+}
+QTreeView::branch:selected {
+ background: {color:bg-view};
}
QAbstractItemView::branch:open:has-children:!has-siblings,
QAbstractItemView::branch:open:has-children:has-siblings {
border-image: none;
image: url(:/openpype/images/branch_open.png);
- background: transparent;
+ background: {color:bg-view};
}
QAbstractItemView::branch:open:has-children:!has-siblings:hover,
QAbstractItemView::branch:open:has-children:has-siblings:hover {
border-image: none;
image: url(:/openpype/images/branch_open_on.png);
- background: transparent;
+ background: {color:bg-view};
}
QAbstractItemView::branch:has-children:!has-siblings:closed,
QAbstractItemView::branch:closed:has-children:has-siblings {
border-image: none;
image: url(:/openpype/images/branch_closed.png);
- background: transparent;
+ background: {color:bg-view};
}
QAbstractItemView::branch:has-children:!has-siblings:closed:hover,
QAbstractItemView::branch:closed:has-children:has-siblings:hover {
border-image: none;
image: url(:/openpype/images/branch_closed_on.png);
- background: transparent;
+ background: {color:bg-view};
}
QAbstractItemView::branch:has-siblings:!adjoins-item {
border-image: none;
image: url(:/openpype/images/transparent.png);
- background: transparent;
+ background: {color:bg-view};
}
QAbstractItemView::branch:has-siblings:adjoins-item {
border-image: none;
image: url(:/openpype/images/transparent.png);
- background: transparent;
+ background: {color:bg-view};
}
QAbstractItemView::branch:!has-children:!has-siblings:adjoins-item {
border-image: none;
image: url(:/openpype/images/transparent.png);
- background: transparent;
+ background: {color:bg-view};
}
CompleterView {
diff --git a/openpype/tools/attribute_defs/widgets.py b/openpype/tools/attribute_defs/widgets.py
index 8957f2b19d..7dea01e0a8 100644
--- a/openpype/tools/attribute_defs/widgets.py
+++ b/openpype/tools/attribute_defs/widgets.py
@@ -608,7 +608,7 @@ class UnknownAttrWidget(_BaseAttrDefWidget):
class HiddenAttrWidget(_BaseAttrDefWidget):
def _ui_init(self):
self.setVisible(False)
- self._value = None
+ self._value = self.attr_def.default
self._multivalue = False
def setVisible(self, visible):
diff --git a/openpype/tools/ayon_loader/abstract.py b/openpype/tools/ayon_loader/abstract.py
index 45042395d9..bf3e81d485 100644
--- a/openpype/tools/ayon_loader/abstract.py
+++ b/openpype/tools/ayon_loader/abstract.py
@@ -137,7 +137,7 @@ class VersionItem:
handles,
step,
comment,
- source
+ source,
):
self.version_id = version_id
self.product_id = product_id
@@ -215,7 +215,7 @@ class RepreItem:
representation_name,
representation_icon,
product_name,
- folder_label,
+ folder_label
):
self.representation_id = representation_id
self.representation_name = representation_name
@@ -590,6 +590,22 @@ class FrontendLoaderController(_BaseLoaderController):
pass
+ @abstractmethod
+ def get_versions_representation_count(
+ self, project_name, version_ids, sender=None
+ ):
+ """
+ Args:
+ project_name (str): Project name.
+ version_ids (Iterable[str]): Version ids.
+ sender (Optional[str]): Sender who requested the items.
+
+ Returns:
+ dict[str, int]: Representation count by version id.
+ """
+
+ pass
+
@abstractmethod
def get_thumbnail_path(self, project_name, thumbnail_id):
"""Get thumbnail path for thumbnail id.
@@ -849,3 +865,80 @@ class FrontendLoaderController(_BaseLoaderController):
"""
pass
+
+ # Site sync functions
+ @abstractmethod
+ def is_site_sync_enabled(self, project_name=None):
+ """Is site sync enabled.
+
+ Site sync addon can be enabled but can be disabled per project.
+
+ When asked for enabled state without project name, it should return
+ True if site sync addon is available and enabled.
+
+ Args:
+ project_name (Optional[str]): Project name.
+
+ Returns:
+ bool: True if site sync is enabled.
+ """
+
+ pass
+
+ @abstractmethod
+ def get_active_site_icon_def(self, project_name):
+ """Active site icon definition.
+
+ Args:
+ project_name (Union[str, None]): Project name.
+
+ Returns:
+ Union[dict[str, Any], None]: Icon definition or None if site sync
+ is not enabled for the project.
+ """
+
+ pass
+
+ @abstractmethod
+ def get_remote_site_icon_def(self, project_name):
+ """Remote site icon definition.
+
+ Args:
+ project_name (Union[str, None]): Project name.
+
+ Returns:
+ Union[dict[str, Any], None]: Icon definition or None if site sync
+ is not enabled for the project.
+ """
+
+ pass
+
+ @abstractmethod
+ def get_version_sync_availability(self, project_name, version_ids):
+ """Version sync availability.
+
+ Args:
+ project_name (str): Project name.
+ version_ids (Iterable[str]): Version ids.
+
+ Returns:
+ dict[str, tuple[int, int]]: Sync availability by version id.
+ """
+
+ pass
+
+ @abstractmethod
+ def get_representations_sync_status(
+ self, project_name, representation_ids
+ ):
+ """Representations sync status.
+
+ Args:
+ project_name (str): Project name.
+ representation_ids (Iterable[str]): Representation ids.
+
+ Returns:
+ dict[str, tuple[int, int]]: Sync status by representation id.
+ """
+
+ pass
diff --git a/openpype/tools/ayon_loader/control.py b/openpype/tools/ayon_loader/control.py
index 8ec0d96e2e..060cef6661 100644
--- a/openpype/tools/ayon_loader/control.py
+++ b/openpype/tools/ayon_loader/control.py
@@ -15,7 +15,12 @@ from openpype.tools.ayon_utils.models import (
)
from .abstract import BackendLoaderController, FrontendLoaderController
-from .models import SelectionModel, ProductsModel, LoaderActionsModel
+from .models import (
+ SelectionModel,
+ ProductsModel,
+ LoaderActionsModel,
+ SiteSyncModel
+)
class ExpectedSelection:
@@ -108,6 +113,7 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
self._products_model = ProductsModel(self)
self._loader_actions_model = LoaderActionsModel(self)
self._thumbnails_model = ThumbnailsModel()
+ self._site_sync_model = SiteSyncModel(self)
@property
def log(self):
@@ -143,6 +149,7 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
self._loader_actions_model.reset()
self._projects_model.reset()
self._thumbnails_model.reset()
+ self._site_sync_model.reset()
self._projects_model.refresh()
@@ -195,13 +202,22 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
project_name, version_ids, sender
)
+ def get_versions_representation_count(
+ self, project_name, version_ids, sender=None
+ ):
+ return self._products_model.get_versions_repre_count(
+ project_name, version_ids, sender
+ )
+
def get_folder_thumbnail_ids(self, project_name, folder_ids):
return self._thumbnails_model.get_folder_thumbnail_ids(
- project_name, folder_ids)
+ project_name, folder_ids
+ )
def get_version_thumbnail_ids(self, project_name, version_ids):
return self._thumbnails_model.get_version_thumbnail_ids(
- project_name, version_ids)
+ project_name, version_ids
+ )
def get_thumbnail_path(self, project_name, thumbnail_id):
return self._thumbnails_model.get_thumbnail_path(
@@ -219,8 +235,16 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
def get_representations_action_items(
self, project_name, representation_ids):
- return self._loader_actions_model.get_representations_action_items(
+ action_items = (
+ self._loader_actions_model.get_representations_action_items(
+ project_name, representation_ids)
+ )
+
+ action_items.extend(self._site_sync_model.get_site_sync_action_items(
project_name, representation_ids)
+ )
+
+ return action_items
def trigger_action_item(
self,
@@ -230,6 +254,14 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
version_ids,
representation_ids
):
+ if self._site_sync_model.is_site_sync_action(identifier):
+ self._site_sync_model.trigger_action_item(
+ identifier,
+ project_name,
+ representation_ids
+ )
+ return
+
self._loader_actions_model.trigger_action_item(
identifier,
options,
@@ -336,6 +368,27 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
self._loaded_products_cache.update_data(product_ids)
return self._loaded_products_cache.get_data()
+ def is_site_sync_enabled(self, project_name=None):
+ return self._site_sync_model.is_site_sync_enabled(project_name)
+
+ def get_active_site_icon_def(self, project_name):
+ return self._site_sync_model.get_active_site_icon_def(project_name)
+
+ def get_remote_site_icon_def(self, project_name):
+ return self._site_sync_model.get_remote_site_icon_def(project_name)
+
+ def get_version_sync_availability(self, project_name, version_ids):
+ return self._site_sync_model.get_version_sync_availability(
+ project_name, version_ids
+ )
+
+ def get_representations_sync_status(
+ self, project_name, representation_ids
+ ):
+ return self._site_sync_model.get_representations_sync_status(
+ project_name, representation_ids
+ )
+
def is_loaded_products_supported(self):
return self._host is not None
diff --git a/openpype/tools/ayon_loader/models/__init__.py b/openpype/tools/ayon_loader/models/__init__.py
index 6adfe71d86..8e640659a0 100644
--- a/openpype/tools/ayon_loader/models/__init__.py
+++ b/openpype/tools/ayon_loader/models/__init__.py
@@ -1,10 +1,12 @@
from .selection import SelectionModel
from .products import ProductsModel
from .actions import LoaderActionsModel
+from .site_sync import SiteSyncModel
__all__ = (
"SelectionModel",
"ProductsModel",
"LoaderActionsModel",
+ "SiteSyncModel",
)
diff --git a/openpype/tools/ayon_loader/models/products.py b/openpype/tools/ayon_loader/models/products.py
index 816dabaf90..135f28df97 100644
--- a/openpype/tools/ayon_loader/models/products.py
+++ b/openpype/tools/ayon_loader/models/products.py
@@ -44,7 +44,7 @@ def version_item_from_entity(version):
# NOTE There is also 'updatedAt', should be used that instead?
# TODO skip conversion - converting to '%Y%m%dT%H%M%SZ' is because
# 'PrettyTimeDelegate' expects it
- created_at = arrow.get(version["createdAt"])
+ created_at = arrow.get(version["createdAt"]).to("local")
published_time = created_at.strftime("%Y%m%dT%H%M%SZ")
author = version["author"]
version_num = version["version"]
@@ -317,6 +317,42 @@ class ProductsModel:
return output
+ def get_versions_repre_count(self, project_name, version_ids, sender):
+ """Get representation count for passed version ids.
+
+ Args:
+ project_name (str): Project name.
+ version_ids (Iterable[str]): Version ids.
+ sender (Union[str, None]): Who triggered the method.
+
+ Returns:
+ dict[str, int]: Number of representations by version id.
+ """
+
+ output = {}
+ if not any((project_name, version_ids)):
+ return output
+
+ invalid_version_ids = set()
+ project_cache = self._repre_items_cache[project_name]
+ for version_id in version_ids:
+ version_cache = project_cache[version_id]
+ if version_cache.is_valid:
+ output[version_id] = len(version_cache.get_data())
+ else:
+ invalid_version_ids.add(version_id)
+
+ if invalid_version_ids:
+ self.refresh_representation_items(
+ project_name, invalid_version_ids, sender
+ )
+
+ for version_id in invalid_version_ids:
+ version_cache = project_cache[version_id]
+ output[version_id] = len(version_cache.get_data())
+
+ return output
+
def change_products_group(self, project_name, product_ids, group_name):
"""Change group name for passed product ids.
diff --git a/openpype/tools/ayon_loader/models/site_sync.py b/openpype/tools/ayon_loader/models/site_sync.py
new file mode 100644
index 0000000000..90852b6954
--- /dev/null
+++ b/openpype/tools/ayon_loader/models/site_sync.py
@@ -0,0 +1,509 @@
+import collections
+
+from openpype.lib import Logger
+from openpype.client.entities import get_representations
+from openpype.client import get_linked_representation_id
+from openpype.modules import ModulesManager
+from openpype.tools.ayon_utils.models import NestedCacheItem
+from openpype.tools.ayon_loader.abstract import ActionItem
+
+DOWNLOAD_IDENTIFIER = "sitesync.download"
+UPLOAD_IDENTIFIER = "sitesync.upload"
+REMOVE_IDENTIFIER = "sitesync.remove"
+
+log = Logger.get_logger(__name__)
+
+
+def _default_version_availability():
+ return 0, 0
+
+
+def _default_repre_status():
+ return 0.0, 0.0
+
+
+class SiteSyncModel:
+ """Model handling site sync logic.
+
+ Model cares about handling of site sync functionality. All public
+ functions should be possible to call even if site sync is not available.
+ """
+
+ lifetime = 60 # In seconds (minute by default)
+ status_lifetime = 20
+
+ def __init__(self, controller):
+ self._controller = controller
+
+ self._site_icons = None
+ self._site_sync_enabled_cache = NestedCacheItem(
+ levels=1, lifetime=self.lifetime
+ )
+ self._active_site_cache = NestedCacheItem(
+ levels=1, lifetime=self.lifetime
+ )
+ self._remote_site_cache = NestedCacheItem(
+ levels=1, lifetime=self.lifetime
+ )
+ self._version_availability_cache = NestedCacheItem(
+ levels=2,
+ default_factory=_default_version_availability,
+ lifetime=self.status_lifetime
+ )
+ self._repre_status_cache = NestedCacheItem(
+ levels=2,
+ default_factory=_default_repre_status,
+ lifetime=self.status_lifetime
+ )
+
+ manager = ModulesManager()
+ self._site_sync_addon = manager.get("sync_server")
+
+ def reset(self):
+ self._site_icons = None
+ self._site_sync_enabled_cache.reset()
+ self._active_site_cache.reset()
+ self._remote_site_cache.reset()
+ self._version_availability_cache.reset()
+ self._repre_status_cache.reset()
+
+ def is_site_sync_enabled(self, project_name=None):
+ """Site sync is enabled for a project.
+
+ Returns false if site sync addon is not available or enabled
+ or project has disabled it.
+
+ Args:
+ project_name (Union[str, None]): Project name. If project name
+ is 'None', True is returned if site sync addon
+ is available and enabled.
+
+ Returns:
+ bool: Site sync is enabled.
+ """
+
+ if not self._is_site_sync_addon_enabled():
+ return False
+ cache = self._site_sync_enabled_cache[project_name]
+ if not cache.is_valid:
+ enabled = True
+ if project_name:
+ enabled = self._site_sync_addon.is_project_enabled(
+ project_name, single=True
+ )
+ cache.update_data(enabled)
+ return cache.get_data()
+
+ def get_active_site(self, project_name):
+ """Active site name for a project.
+
+ Args:
+ project_name (str): Project name.
+
+ Returns:
+ Union[str, None]: Remote site name.
+ """
+
+ cache = self._active_site_cache[project_name]
+ if not cache.is_valid:
+ site_name = None
+ if project_name and self._is_site_sync_addon_enabled():
+ site_name = self._site_sync_addon.get_active_site(project_name)
+ cache.update_data(site_name)
+ return cache.get_data()
+
+ def get_remote_site(self, project_name):
+ """Remote site name for a project.
+
+ Args:
+ project_name (str): Project name.
+
+ Returns:
+ Union[str, None]: Remote site name.
+ """
+
+ cache = self._remote_site_cache[project_name]
+ if not cache.is_valid:
+ site_name = None
+ if project_name and self._is_site_sync_addon_enabled():
+ site_name = self._site_sync_addon.get_remote_site(project_name)
+ cache.update_data(site_name)
+ return cache.get_data()
+
+ def get_active_site_icon_def(self, project_name):
+ """Active site icon definition.
+
+ Args:
+ project_name (Union[str, None]): Name of project.
+
+ Returns:
+ Union[dict[str, Any], None]: Site icon definition.
+ """
+
+ if not project_name:
+ return None
+
+ active_site = self.get_active_site(project_name)
+ provider = self._get_provider_for_site(project_name, active_site)
+ return self._get_provider_icon(provider)
+
+ def get_remote_site_icon_def(self, project_name):
+ """Remote site icon definition.
+
+ Args:
+ project_name (Union[str, None]): Name of project.
+
+ Returns:
+ Union[dict[str, Any], None]: Site icon definition.
+ """
+
+ if not project_name or not self.is_site_sync_enabled(project_name):
+ return None
+ remote_site = self.get_remote_site(project_name)
+ provider = self._get_provider_for_site(project_name, remote_site)
+ return self._get_provider_icon(provider)
+
+ def get_version_sync_availability(self, project_name, version_ids):
+ """Returns how many representations are available on sites.
+
+ Returned value `{version_id: (4, 6)}` denotes that locally are
+ available 4 and remotely 6 representation.
+ NOTE: Available means they were synced to site.
+
+ Returns:
+ dict[str, tuple[int, int]]
+ """
+
+ if not self.is_site_sync_enabled(project_name):
+ return {
+ version_id: _default_version_availability()
+ for version_id in version_ids
+ }
+
+ output = {}
+ project_cache = self._version_availability_cache[project_name]
+ invalid_ids = set()
+ for version_id in version_ids:
+ repre_cache = project_cache[version_id]
+ if repre_cache.is_valid:
+ output[version_id] = repre_cache.get_data()
+ else:
+ invalid_ids.add(version_id)
+
+ if invalid_ids:
+ self._refresh_version_availability(
+ project_name, invalid_ids
+ )
+ for version_id in invalid_ids:
+ version_cache = project_cache[version_id]
+ output[version_id] = version_cache.get_data()
+ return output
+
+ def get_representations_sync_status(
+ self, project_name, representation_ids
+ ):
+ """
+
+ Args:
+ project_name (str): Project name.
+ representation_ids (Iterable[str]): Representation ids.
+
+ Returns:
+ dict[str, tuple[float, float]]
+ """
+
+ if not self.is_site_sync_enabled(project_name):
+ return {
+ repre_id: _default_repre_status()
+ for repre_id in representation_ids
+ }
+
+ output = {}
+ project_cache = self._repre_status_cache[project_name]
+ invalid_ids = set()
+ for repre_id in representation_ids:
+ repre_cache = project_cache[repre_id]
+ if repre_cache.is_valid:
+ output[repre_id] = repre_cache.get_data()
+ else:
+ invalid_ids.add(repre_id)
+
+ if invalid_ids:
+ self._refresh_representations_sync_status(
+ project_name, invalid_ids
+ )
+ for repre_id in invalid_ids:
+ repre_cache = project_cache[repre_id]
+ output[repre_id] = repre_cache.get_data()
+ return output
+
+ def get_site_sync_action_items(self, project_name, representation_ids):
+ """
+
+ Args:
+ project_name (str): Project name.
+ representation_ids (Iterable[str]): Representation ids.
+
+ Returns:
+ list[ActionItem]: Actions that can be shown in loader.
+ """
+
+ if not self.is_site_sync_enabled(project_name):
+ return []
+
+ repres_status = self.get_representations_sync_status(
+ project_name, representation_ids
+ )
+
+ repre_ids_per_identifier = collections.defaultdict(set)
+ for repre_id in representation_ids:
+ repre_status = repres_status[repre_id]
+ local_status, remote_status = repre_status
+
+ if local_status:
+ repre_ids_per_identifier[UPLOAD_IDENTIFIER].add(repre_id)
+ repre_ids_per_identifier[REMOVE_IDENTIFIER].add(repre_id)
+
+ if remote_status:
+ repre_ids_per_identifier[DOWNLOAD_IDENTIFIER].add(repre_id)
+
+ action_items = []
+ for identifier, repre_ids in repre_ids_per_identifier.items():
+ if identifier == DOWNLOAD_IDENTIFIER:
+ action_items.append(self._create_download_action_item(
+ project_name, repre_ids
+ ))
+ elif identifier == UPLOAD_IDENTIFIER:
+ action_items.append(self._create_upload_action_item(
+ project_name, repre_ids
+ ))
+ elif identifier == REMOVE_IDENTIFIER:
+ action_items.append(self._create_delete_action_item(
+ project_name, repre_ids
+ ))
+
+ return action_items
+
+ def is_site_sync_action(self, identifier):
+ """Should be `identifier` handled by SiteSync.
+
+ Args:
+ identifier (str): Action identifier.
+
+ Returns:
+ bool: Should action be handled by SiteSync.
+ """
+
+ return identifier in {
+ UPLOAD_IDENTIFIER,
+ DOWNLOAD_IDENTIFIER,
+ REMOVE_IDENTIFIER,
+ }
+
+ def trigger_action_item(
+ self,
+ identifier,
+ project_name,
+ representation_ids
+ ):
+ """Resets status for site_name or remove local files.
+
+ Args:
+ identifier (str): Action identifier.
+ project_name (str): Project name.
+ representation_ids (Iterable[str]): Representation ids.
+ """
+
+ active_site = self.get_active_site(project_name)
+ remote_site = self.get_remote_site(project_name)
+
+ repre_docs = list(get_representations(
+ project_name, representation_ids=representation_ids
+ ))
+ families_per_repre_id = {
+ item["_id"]: item["context"]["family"]
+ for item in repre_docs
+ }
+
+ for repre_id in representation_ids:
+ family = families_per_repre_id[repre_id]
+ if identifier == DOWNLOAD_IDENTIFIER:
+ self._add_site(
+ project_name, repre_id, active_site, family
+ )
+
+ elif identifier == UPLOAD_IDENTIFIER:
+ self._add_site(
+ project_name, repre_id, remote_site, family
+ )
+
+ elif identifier == REMOVE_IDENTIFIER:
+ self._site_sync_addon.remove_site(
+ project_name,
+ repre_id,
+ active_site,
+ remove_local_files=True
+ )
+
+ def _is_site_sync_addon_enabled(self):
+ """
+ Returns:
+ bool: Site sync addon is enabled.
+ """
+
+ if self._site_sync_addon is None:
+ return False
+ return self._site_sync_addon.enabled
+
+ def _get_provider_for_site(self, project_name, site_name):
+ """Provider for a site.
+
+ Args:
+ project_name (str): Project name.
+ site_name (str): Site name.
+
+ Returns:
+ Union[str, None]: Provider name.
+ """
+
+ if not self._is_site_sync_addon_enabled():
+ return None
+ return self._site_sync_addon.get_provider_for_site(
+ project_name, site_name
+ )
+
+ def _get_provider_icon(self, provider):
+ """site provider icons.
+
+ Returns:
+ Union[dict[str, Any], None]: Icon of site provider.
+ """
+
+ if not provider:
+ return None
+
+ if self._site_icons is None:
+ self._site_icons = self._site_sync_addon.get_site_icons()
+ return self._site_icons.get(provider)
+
+ def _refresh_version_availability(self, project_name, version_ids):
+ if not project_name or not version_ids:
+ return
+ project_cache = self._version_availability_cache[project_name]
+
+ avail_by_id = self._site_sync_addon.get_version_availability(
+ project_name,
+ version_ids,
+ self.get_active_site(project_name),
+ self.get_remote_site(project_name),
+ )
+ for version_id in version_ids:
+ status = avail_by_id.get(version_id)
+ if status is None:
+ status = _default_version_availability()
+ project_cache[version_id].update_data(status)
+
+ def _refresh_representations_sync_status(
+ self, project_name, representation_ids
+ ):
+ if not project_name or not representation_ids:
+ return
+ project_cache = self._repre_status_cache[project_name]
+ status_by_repre_id = (
+ self._site_sync_addon.get_representations_sync_state(
+ project_name,
+ representation_ids,
+ self.get_active_site(project_name),
+ self.get_remote_site(project_name),
+ )
+ )
+ for repre_id in representation_ids:
+ status = status_by_repre_id.get(repre_id)
+ if status is None:
+ status = _default_repre_status()
+ project_cache[repre_id].update_data(status)
+
+ def _create_download_action_item(self, project_name, representation_ids):
+ return self._create_action_item(
+ project_name,
+ representation_ids,
+ DOWNLOAD_IDENTIFIER,
+ "Download",
+ "Mark representation for download locally",
+ "fa.download"
+ )
+
+ def _create_upload_action_item(self, project_name, representation_ids):
+ return self._create_action_item(
+ project_name,
+ representation_ids,
+ UPLOAD_IDENTIFIER,
+ "Upload",
+ "Mark representation for upload remotely",
+ "fa.upload"
+ )
+
+ def _create_delete_action_item(self, project_name, representation_ids):
+ return self._create_action_item(
+ project_name,
+ representation_ids,
+ REMOVE_IDENTIFIER,
+ "Remove from local",
+ "Remove local synchronization",
+ "fa.trash"
+ )
+
+ def _create_action_item(
+ self,
+ project_name,
+ representation_ids,
+ identifier,
+ label,
+ tooltip,
+ icon_name
+ ):
+ return ActionItem(
+ identifier,
+ label,
+ icon={
+ "type": "awesome-font",
+ "name": icon_name,
+ "color": "#999999"
+ },
+ tooltip=tooltip,
+ options={},
+ order=1,
+ project_name=project_name,
+ folder_ids=[],
+ product_ids=[],
+ version_ids=[],
+ representation_ids=representation_ids,
+ )
+
+ def _add_site(self, project_name, repre_id, site_name, family):
+ self._site_sync_addon.add_site(
+ project_name, repre_id, site_name, force=True
+ )
+
+ # TODO this should happen in site sync addon
+ if family != "workfile":
+ return
+
+ links = get_linked_representation_id(
+ project_name,
+ repre_id=repre_id,
+ link_type="reference"
+ )
+ for link_repre_id in links:
+ try:
+ print("Adding {} to linked representation: {}".format(
+ site_name, link_repre_id))
+ self._site_sync_addon.add_site(
+ project_name,
+ link_repre_id,
+ site_name,
+ force=False
+ )
+ except Exception:
+ # do not add/reset working site for references
+ log.debug("Site present", exc_info=True)
diff --git a/openpype/tools/ayon_loader/ui/products_delegates.py b/openpype/tools/ayon_loader/ui/products_delegates.py
index 6729468bfa..979fa57fd2 100644
--- a/openpype/tools/ayon_loader/ui/products_delegates.py
+++ b/openpype/tools/ayon_loader/ui/products_delegates.py
@@ -8,6 +8,11 @@ from .products_model import (
VERSION_NAME_EDIT_ROLE,
VERSION_ID_ROLE,
PRODUCT_IN_SCENE_ROLE,
+ ACTIVE_SITE_ICON_ROLE,
+ REMOTE_SITE_ICON_ROLE,
+ REPRESENTATIONS_COUNT_ROLE,
+ SYNC_ACTIVE_SITE_AVAILABILITY,
+ SYNC_REMOTE_SITE_AVAILABILITY,
)
@@ -189,3 +194,78 @@ class LoadedInSceneDelegate(QtWidgets.QStyledItemDelegate):
value = index.data(PRODUCT_IN_SCENE_ROLE)
color = self._colors.get(value, self._default_color)
option.palette.setBrush(QtGui.QPalette.Text, color)
+
+
+class SiteSyncDelegate(QtWidgets.QStyledItemDelegate):
+ """Paints icons and downloaded representation ration for both sites."""
+
+ def paint(self, painter, option, index):
+ super(SiteSyncDelegate, self).paint(painter, option, index)
+ option = QtWidgets.QStyleOptionViewItem(option)
+ option.showDecorationSelected = True
+
+ active_icon = index.data(ACTIVE_SITE_ICON_ROLE)
+ remote_icon = index.data(REMOTE_SITE_ICON_ROLE)
+
+ availability_active = "{}/{}".format(
+ index.data(SYNC_ACTIVE_SITE_AVAILABILITY),
+ index.data(REPRESENTATIONS_COUNT_ROLE)
+ )
+ availability_remote = "{}/{}".format(
+ index.data(SYNC_REMOTE_SITE_AVAILABILITY),
+ index.data(REPRESENTATIONS_COUNT_ROLE)
+ )
+
+ if availability_active is None or availability_remote is None:
+ return
+
+ items_to_draw = [
+ (value, icon)
+ for value, icon in (
+ (availability_active, active_icon),
+ (availability_remote, remote_icon),
+ )
+ if icon
+ ]
+ if not items_to_draw:
+ return
+
+ icon_size = QtCore.QSize(24, 24)
+ padding = 10
+ pos_x = option.rect.x()
+
+ item_width = int(option.rect.width() / len(items_to_draw))
+ if item_width < 1:
+ item_width = 0
+
+ for value, icon in items_to_draw:
+ item_rect = QtCore.QRect(
+ pos_x,
+ option.rect.y(),
+ item_width,
+ option.rect.height()
+ )
+ # Prepare pos_x for next item
+ pos_x = item_rect.x() + item_rect.width()
+
+ pixmap = icon.pixmap(icon.actualSize(icon_size))
+ point = QtCore.QPoint(
+ item_rect.x() + padding,
+ item_rect.y() + ((item_rect.height() - pixmap.height()) * 0.5)
+ )
+ painter.drawPixmap(point, pixmap)
+
+ icon_offset = icon_size.width() + (padding * 2)
+ text_rect = QtCore.QRect(item_rect)
+ text_rect.setLeft(text_rect.left() + icon_offset)
+ if text_rect.width() < 1:
+ continue
+
+ painter.drawText(
+ text_rect,
+ option.displayAlignment,
+ value
+ )
+
+ def displayText(self, value, locale):
+ pass
diff --git a/openpype/tools/ayon_loader/ui/products_model.py b/openpype/tools/ayon_loader/ui/products_model.py
index 741f15766b..84f5bc9a5f 100644
--- a/openpype/tools/ayon_loader/ui/products_model.py
+++ b/openpype/tools/ayon_loader/ui/products_model.py
@@ -29,6 +29,11 @@ VERSION_HANDLES_ROLE = QtCore.Qt.UserRole + 18
VERSION_STEP_ROLE = QtCore.Qt.UserRole + 19
VERSION_AVAILABLE_ROLE = QtCore.Qt.UserRole + 20
VERSION_THUMBNAIL_ID_ROLE = QtCore.Qt.UserRole + 21
+ACTIVE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 22
+REMOTE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 23
+REPRESENTATIONS_COUNT_ROLE = QtCore.Qt.UserRole + 24
+SYNC_ACTIVE_SITE_AVAILABILITY = QtCore.Qt.UserRole + 25
+SYNC_REMOTE_SITE_AVAILABILITY = QtCore.Qt.UserRole + 26
class ProductsModel(QtGui.QStandardItemModel):
@@ -68,6 +73,7 @@ class ProductsModel(QtGui.QStandardItemModel):
published_time_col = column_labels.index("Time")
folders_label_col = column_labels.index("Folder")
in_scene_col = column_labels.index("In scene")
+ site_sync_avail_col = column_labels.index("Availability")
def __init__(self, controller):
super(ProductsModel, self).__init__()
@@ -303,7 +309,26 @@ class ProductsModel(QtGui.QStandardItemModel):
model_item.setData(
version_item.thumbnail_id, VERSION_THUMBNAIL_ID_ROLE)
- def _get_product_model_item(self, product_item):
+ # TODO call site sync methods for all versions at once
+ project_name = self._last_project_name
+ version_id = version_item.version_id
+ repre_count = self._controller.get_versions_representation_count(
+ project_name, [version_id]
+ )[version_id]
+ active, remote = self._controller.get_version_sync_availability(
+ project_name, [version_id]
+ )[version_id]
+
+ model_item.setData(repre_count, REPRESENTATIONS_COUNT_ROLE)
+ model_item.setData(active, SYNC_ACTIVE_SITE_AVAILABILITY)
+ model_item.setData(remote, SYNC_REMOTE_SITE_AVAILABILITY)
+
+ def _get_product_model_item(
+ self,
+ product_item,
+ active_site_icon,
+ remote_site_icon
+ ):
model_item = self._items_by_id.get(product_item.product_id)
versions = list(product_item.version_items.values())
versions.sort()
@@ -329,6 +354,9 @@ class ProductsModel(QtGui.QStandardItemModel):
in_scene = 1 if product_item.product_in_scene else 0
model_item.setData(in_scene, PRODUCT_IN_SCENE_ROLE)
+ model_item.setData(active_site_icon, ACTIVE_SITE_ICON_ROLE)
+ model_item.setData(remote_site_icon, REMOTE_SITE_ICON_ROLE)
+
self._set_version_data_to_product_item(model_item, last_version)
return model_item
@@ -341,6 +369,15 @@ class ProductsModel(QtGui.QStandardItemModel):
self._last_project_name = project_name
self._last_folder_ids = folder_ids
+ active_site_icon_def = self._controller.get_active_site_icon_def(
+ project_name
+ )
+ remote_site_icon_def = self._controller.get_remote_site_icon_def(
+ project_name
+ )
+ active_site_icon = get_qt_icon(active_site_icon_def)
+ remote_site_icon = get_qt_icon(remote_site_icon_def)
+
product_items = self._controller.get_product_items(
project_name,
folder_ids,
@@ -402,7 +439,11 @@ class ProductsModel(QtGui.QStandardItemModel):
new_root_items.append(parent_item)
for product_item in top_items:
- item = self._get_product_model_item(product_item)
+ item = self._get_product_model_item(
+ product_item,
+ active_site_icon,
+ remote_site_icon,
+ )
new_items.append(item)
for path_info in merged_product_items.values():
@@ -418,7 +459,11 @@ class ProductsModel(QtGui.QStandardItemModel):
merged_product_types = set()
new_merged_items = []
for product_item in product_items:
- item = self._get_product_model_item(product_item)
+ item = self._get_product_model_item(
+ product_item,
+ active_site_icon,
+ remote_site_icon,
+ )
new_merged_items.append(item)
merged_product_types.add(product_item.product_type)
diff --git a/openpype/tools/ayon_loader/ui/products_widget.py b/openpype/tools/ayon_loader/ui/products_widget.py
index 2d4959dc19..99faefe693 100644
--- a/openpype/tools/ayon_loader/ui/products_widget.py
+++ b/openpype/tools/ayon_loader/ui/products_widget.py
@@ -19,7 +19,11 @@ from .products_model import (
VERSION_ID_ROLE,
VERSION_THUMBNAIL_ID_ROLE,
)
-from .products_delegates import VersionDelegate, LoadedInSceneDelegate
+from .products_delegates import (
+ VersionDelegate,
+ LoadedInSceneDelegate,
+ SiteSyncDelegate
+)
from .actions_utils import show_actions_menu
@@ -92,7 +96,7 @@ class ProductsWidget(QtWidgets.QWidget):
55, # Handles
10, # Step
25, # Loaded in scene
- 65, # Site info (maybe?)
+ 65, # Site sync info
)
def __init__(self, controller, parent):
@@ -135,6 +139,10 @@ class ProductsWidget(QtWidgets.QWidget):
products_view.setItemDelegateForColumn(
products_model.in_scene_col, in_scene_delegate)
+ site_sync_delegate = SiteSyncDelegate()
+ products_view.setItemDelegateForColumn(
+ products_model.site_sync_avail_col, site_sync_delegate)
+
main_layout = QtWidgets.QHBoxLayout(self)
main_layout.setContentsMargins(0, 0, 0, 0)
main_layout.addWidget(products_view, 1)
@@ -167,6 +175,8 @@ class ProductsWidget(QtWidgets.QWidget):
self._version_delegate = version_delegate
self._time_delegate = time_delegate
+ self._in_scene_delegate = in_scene_delegate
+ self._site_sync_delegate = site_sync_delegate
self._selected_project_name = None
self._selected_folder_ids = set()
@@ -182,6 +192,9 @@ class ProductsWidget(QtWidgets.QWidget):
products_model.in_scene_col,
not controller.is_loaded_products_supported()
)
+ self._set_site_sync_visibility(
+ self._controller.is_site_sync_enabled()
+ )
def set_name_filter(self, name):
"""Set filter of product name.
@@ -216,6 +229,12 @@ class ProductsWidget(QtWidgets.QWidget):
def refresh(self):
self._refresh_model()
+ def _set_site_sync_visibility(self, site_sync_enabled):
+ self._products_view.setColumnHidden(
+ self._products_model.site_sync_avail_col,
+ not site_sync_enabled
+ )
+
def _fill_version_editor(self):
model = self._products_proxy_model
index_queue = collections.deque()
@@ -375,7 +394,12 @@ class ProductsWidget(QtWidgets.QWidget):
self._on_selection_change()
def _on_folders_selection_change(self, event):
- self._selected_project_name = event["project_name"]
+ project_name = event["project_name"]
+ site_sync_enabled = self._controller.is_site_sync_enabled(
+ project_name
+ )
+ self._set_site_sync_visibility(site_sync_enabled)
+ self._selected_project_name = project_name
self._selected_folder_ids = event["folder_ids"]
self._refresh_model()
self._update_folders_label_visible()
diff --git a/openpype/tools/ayon_loader/ui/repres_widget.py b/openpype/tools/ayon_loader/ui/repres_widget.py
index 7de582e629..efc1bb89a4 100644
--- a/openpype/tools/ayon_loader/ui/repres_widget.py
+++ b/openpype/tools/ayon_loader/ui/repres_widget.py
@@ -14,6 +14,10 @@ REPRESENTATION_ID_ROLE = QtCore.Qt.UserRole + 2
PRODUCT_NAME_ROLE = QtCore.Qt.UserRole + 3
FOLDER_LABEL_ROLE = QtCore.Qt.UserRole + 4
GROUP_TYPE_ROLE = QtCore.Qt.UserRole + 5
+ACTIVE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 6
+REMOTE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 7
+SYNC_ACTIVE_SITE_PROGRESS = QtCore.Qt.UserRole + 8
+SYNC_REMOTE_SITE_PROGRESS = QtCore.Qt.UserRole + 9
class RepresentationsModel(QtGui.QStandardItemModel):
@@ -22,12 +26,14 @@ class RepresentationsModel(QtGui.QStandardItemModel):
("Name", 120),
("Product name", 125),
("Folder", 125),
- # ("Active site", 85),
- # ("Remote site", 85)
+ ("Active site", 85),
+ ("Remote site", 85)
]
column_labels = [label for label, _ in colums_info]
column_widths = [width for _, width in colums_info]
folder_column = column_labels.index("Product name")
+ active_site_column = column_labels.index("Active site")
+ remote_site_column = column_labels.index("Remote site")
def __init__(self, controller):
super(RepresentationsModel, self).__init__()
@@ -59,7 +65,7 @@ class RepresentationsModel(QtGui.QStandardItemModel):
repre_items = self._controller.get_representation_items(
self._selected_project_name, self._selected_version_ids
)
- self._fill_items(repre_items)
+ self._fill_items(repre_items, self._selected_project_name)
self.refreshed.emit()
def data(self, index, role=None):
@@ -69,13 +75,23 @@ class RepresentationsModel(QtGui.QStandardItemModel):
col = index.column()
if col != 0:
if role == QtCore.Qt.DecorationRole:
- return None
+ if col == 3:
+ role = ACTIVE_SITE_ICON_ROLE
+ elif col == 4:
+ role = REMOTE_SITE_ICON_ROLE
+ else:
+ return None
if role == QtCore.Qt.DisplayRole:
if col == 1:
role = PRODUCT_NAME_ROLE
elif col == 2:
role = FOLDER_LABEL_ROLE
+ elif col == 3:
+ role = SYNC_ACTIVE_SITE_PROGRESS
+ elif col == 4:
+ role = SYNC_REMOTE_SITE_PROGRESS
+
index = self.index(index.row(), 0, index.parent())
return super(RepresentationsModel, self).data(index, role)
@@ -89,7 +105,13 @@ class RepresentationsModel(QtGui.QStandardItemModel):
root_item = self.invisibleRootItem()
root_item.removeRows(0, root_item.rowCount())
- def _get_repre_item(self, repre_item):
+ def _get_repre_item(
+ self,
+ repre_item,
+ active_site_icon,
+ remote_site_icon,
+ repres_sync_status
+ ):
repre_id = repre_item.representation_id
repre_name = repre_item.representation_name
repre_icon = repre_item.representation_icon
@@ -102,6 +124,12 @@ class RepresentationsModel(QtGui.QStandardItemModel):
item.setColumnCount(self.columnCount())
item.setEditable(False)
+ sync_status = repres_sync_status[repre_id]
+ active_progress, remote_progress = sync_status
+
+ active_site_progress = "{}%".format(int(active_progress * 100))
+ remote_site_progress = "{}%".format(int(remote_progress * 100))
+
icon = get_qt_icon(repre_icon)
item.setData(repre_name, QtCore.Qt.DisplayRole)
item.setData(icon, QtCore.Qt.DecorationRole)
@@ -109,6 +137,10 @@ class RepresentationsModel(QtGui.QStandardItemModel):
item.setData(repre_id, REPRESENTATION_ID_ROLE)
item.setData(repre_item.product_name, PRODUCT_NAME_ROLE)
item.setData(repre_item.folder_label, FOLDER_LABEL_ROLE)
+ item.setData(active_site_icon, ACTIVE_SITE_ICON_ROLE)
+ item.setData(remote_site_icon, REMOTE_SITE_ICON_ROLE)
+ item.setData(active_site_progress, SYNC_ACTIVE_SITE_PROGRESS)
+ item.setData(remote_site_progress, SYNC_REMOTE_SITE_PROGRESS)
return is_new_item, item
def _get_group_icon(self):
@@ -134,14 +166,29 @@ class RepresentationsModel(QtGui.QStandardItemModel):
self._groups_items_by_name[repre_name] = item
return True, item
- def _fill_items(self, repre_items):
+ def _fill_items(self, repre_items, project_name):
+ active_site_icon_def = self._controller.get_active_site_icon_def(
+ project_name
+ )
+ remote_site_icon_def = self._controller.get_remote_site_icon_def(
+ project_name
+ )
+ active_site_icon = get_qt_icon(active_site_icon_def)
+ remote_site_icon = get_qt_icon(remote_site_icon_def)
+
items_to_remove = set(self._items_by_id.keys())
repre_items_by_name = collections.defaultdict(list)
+ repre_ids = set()
for repre_item in repre_items:
+ repre_ids.add(repre_item.representation_id)
items_to_remove.discard(repre_item.representation_id)
repre_name = repre_item.representation_name
repre_items_by_name[repre_name].append(repre_item)
+ repres_sync_status = self._controller.get_representations_sync_status(
+ project_name, repre_ids
+ )
+
root_item = self.invisibleRootItem()
for repre_id in items_to_remove:
item = self._items_by_id.pop(repre_id)
@@ -164,7 +211,12 @@ class RepresentationsModel(QtGui.QStandardItemModel):
new_group_items = []
for repre_item in repre_name_items:
- is_new_item, item = self._get_repre_item(repre_item)
+ is_new_item, item = self._get_repre_item(
+ repre_item,
+ active_site_icon,
+ remote_site_icon,
+ repres_sync_status
+ )
item_parent = item.parent()
if item_parent is None:
item_parent = root_item
@@ -255,6 +307,9 @@ class RepresentationsWidget(QtWidgets.QWidget):
self._repre_model = repre_model
self._repre_proxy_model = repre_proxy_model
+ self._set_site_sync_visibility(
+ self._controller.is_site_sync_enabled()
+ )
self._set_multiple_folders_selected(False)
def refresh(self):
@@ -265,6 +320,20 @@ class RepresentationsWidget(QtWidgets.QWidget):
def _on_project_change(self, event):
self._selected_project_name = event["project_name"]
+ site_sync_enabled = self._controller.is_site_sync_enabled(
+ self._selected_project_name
+ )
+ self._set_site_sync_visibility(site_sync_enabled)
+
+ def _set_site_sync_visibility(self, site_sync_enabled):
+ self._repre_view.setColumnHidden(
+ self._repre_model.active_site_column,
+ not site_sync_enabled
+ )
+ self._repre_view.setColumnHidden(
+ self._repre_model.remote_site_column,
+ not site_sync_enabled
+ )
def _set_multiple_folders_selected(self, selected_multiple_folders):
if selected_multiple_folders == self._selected_multiple_folders:
diff --git a/openpype/tools/ayon_utils/widgets/utils.py b/openpype/tools/ayon_utils/widgets/utils.py
index 2817b5efc0..5165b3a262 100644
--- a/openpype/tools/ayon_utils/widgets/utils.py
+++ b/openpype/tools/ayon_utils/widgets/utils.py
@@ -15,6 +15,7 @@ class RefreshThread(QtCore.QThread):
self._callback = partial(func, *args, **kwargs)
self._exception = None
self._result = None
+ self.finished.connect(self._on_finish_callback)
@property
def id(self):
@@ -29,11 +30,19 @@ class RefreshThread(QtCore.QThread):
self._result = self._callback()
except Exception as exc:
self._exception = exc
- self.refresh_finished.emit(self.id)
def get_result(self):
return self._result
+ def _on_finish_callback(self):
+ """Trigger custom signal with thread id.
+
+ Listening for 'finished' signal we make sure that execution of thread
+ finished and QThread object can be safely deleted.
+ """
+
+ self.refresh_finished.emit(self.id)
+
class _IconsCache:
"""Cache for icons."""
diff --git a/openpype/tools/ayon_workfiles/models/workfiles.py b/openpype/tools/ayon_workfiles/models/workfiles.py
index 907b9b5383..d74a8e164d 100644
--- a/openpype/tools/ayon_workfiles/models/workfiles.py
+++ b/openpype/tools/ayon_workfiles/models/workfiles.py
@@ -606,7 +606,7 @@ class PublishWorkfilesModel:
print("Failed to format workfile path: {}".format(exc))
dirpath, filename = os.path.split(workfile_path)
- created_at = arrow.get(repre_entity["createdAt"])
+ created_at = arrow.get(repre_entity["createdAt"].to("local"))
return FileItem(
dirpath,
filename,
diff --git a/openpype/tools/experimental_tools/dialog.py b/openpype/tools/experimental_tools/dialog.py
index 00b6ae07a4..3a25d72ff4 100644
--- a/openpype/tools/experimental_tools/dialog.py
+++ b/openpype/tools/experimental_tools/dialog.py
@@ -1,5 +1,6 @@
from qtpy import QtWidgets, QtCore, QtGui
+from openpype import AYON_SERVER_ENABLED
from openpype.style import (
load_stylesheet,
app_icon_path
@@ -26,7 +27,8 @@ class ExperimentalToolsDialog(QtWidgets.QDialog):
def __init__(self, parent=None):
super(ExperimentalToolsDialog, self).__init__(parent)
- self.setWindowTitle("OpenPype Experimental tools")
+ app_label = "AYON" if AYON_SERVER_ENABLED else "OpenPype"
+ self.setWindowTitle("{} Experimental tools".format(app_label))
icon = QtGui.QIcon(app_icon_path())
self.setWindowIcon(icon)
self.setStyleSheet(load_stylesheet())
@@ -68,8 +70,8 @@ class ExperimentalToolsDialog(QtWidgets.QDialog):
tool_btns_label = QtWidgets.QLabel(
(
"You can enable these features in"
- "
OpenPype tray -> Settings -> Experimental tools"
- ),
+ "
{} tray -> Settings -> Experimental tools"
+ ).format(app_label),
tool_btns_widget
)
tool_btns_label.setAlignment(QtCore.Qt.AlignCenter)
@@ -113,6 +115,7 @@ class ExperimentalToolsDialog(QtWidgets.QDialog):
self._window_is_active = False
def refresh(self):
+ app_label = "AYON" if AYON_SERVER_ENABLED else "OpenPype"
self._experimental_tools.refresh_availability()
buttons_to_remove = set(self._buttons_by_tool_identifier.keys())
@@ -139,8 +142,8 @@ class ExperimentalToolsDialog(QtWidgets.QDialog):
elif is_new or button.isEnabled():
button.setToolTip((
"You can enable this tool in local settings."
- "\n\nOpenPype Tray > Settings > Experimental Tools"
- ))
+ "\n\n{} Tray > Settings > Experimental Tools"
+ ).format(app_label))
if tool.enabled != button.isEnabled():
button.setEnabled(tool.enabled)
diff --git a/openpype/tools/publisher/control.py b/openpype/tools/publisher/control.py
index 9e00d21750..b02d83e4f6 100644
--- a/openpype/tools/publisher/control.py
+++ b/openpype/tools/publisher/control.py
@@ -2517,7 +2517,7 @@ class PublisherController(BasePublisherController):
else:
msg = (
"Something went wrong. Send report"
- " to your supervisor or OpenPype."
+ " to your supervisor or Ynput team."
)
self.publish_error_msg = msg
self.publish_has_crashed = True
diff --git a/openpype/tools/publisher/window.py b/openpype/tools/publisher/window.py
index 2416763c27..b3138c3f45 100644
--- a/openpype/tools/publisher/window.py
+++ b/openpype/tools/publisher/window.py
@@ -9,6 +9,7 @@ from openpype import (
resources,
style
)
+from openpype import AYON_SERVER_ENABLED
from openpype.tools.utils import (
ErrorMessageBox,
PlaceholderLineEdit,
@@ -53,7 +54,9 @@ class PublisherWindow(QtWidgets.QDialog):
self.setObjectName("PublishWindow")
- self.setWindowTitle("OpenPype publisher")
+ self.setWindowTitle("{} publisher".format(
+ "AYON" if AYON_SERVER_ENABLED else "OpenPype"
+ ))
icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
self.setWindowIcon(icon)
diff --git a/openpype/tools/tray/pype_info_widget.py b/openpype/tools/tray/pype_info_widget.py
index dc222b79b5..acd937e711 100644
--- a/openpype/tools/tray/pype_info_widget.py
+++ b/openpype/tools/tray/pype_info_widget.py
@@ -6,6 +6,7 @@ import ayon_api
from qtpy import QtCore, QtGui, QtWidgets
from openpype import style
+import openpype.version
from openpype import resources
from openpype import AYON_SERVER_ENABLED
from openpype.settings.lib import get_local_settings
@@ -219,7 +220,9 @@ class PypeInfoWidget(QtWidgets.QWidget):
icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
self.setWindowIcon(icon)
- self.setWindowTitle("OpenPype info")
+ self.setWindowTitle(
+ "{} info".format("AYON" if AYON_SERVER_ENABLED else "OpenPype")
+ )
scroll_area = QtWidgets.QScrollArea(self)
info_widget = PypeInfoSubWidget(scroll_area)
@@ -441,16 +444,19 @@ class PypeInfoSubWidget(QtWidgets.QWidget):
info_values = {
"executable": executable_args[-1],
"server_url": os.environ["AYON_SERVER_URL"],
+ "bundle_name": os.environ["AYON_BUNDLE_NAME"],
"username": username
}
key_label_mapping = {
"executable": "AYON Executable:",
"server_url": "AYON Server:",
+ "bundle_name": "AYON Bundle:",
"username": "AYON Username:"
}
# Prepare keys order
keys_order = [
"server_url",
+ "bundle_name",
"username",
"executable",
]
@@ -513,4 +519,16 @@ class PypeInfoSubWidget(QtWidgets.QWidget):
info_layout.addWidget(
value_label, row, 1, 1, 1
)
+ if AYON_SERVER_ENABLED:
+ row = info_layout.rowCount()
+ info_layout.addWidget(
+ QtWidgets.QLabel("OpenPype Addon:"), row, 0, 1, 1
+ )
+ value_label = QtWidgets.QLabel(openpype.version.__version__)
+ value_label.setTextInteractionFlags(
+ QtCore.Qt.TextSelectableByMouse
+ )
+ info_layout.addWidget(
+ value_label, row, 1, 1, 1
+ )
return info_widget
diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py
index a5876ca721..769ed4272b 100644
--- a/openpype/tools/tray/pype_tray.py
+++ b/openpype/tools/tray/pype_tray.py
@@ -599,7 +599,10 @@ class TrayManager:
subversion = os.environ.get("OPENPYPE_SUBVERSION")
client_name = os.environ.get("OPENPYPE_CLIENT")
- version_string = openpype.version.__version__
+ if AYON_SERVER_ENABLED:
+ version_string = os.getenv("AYON_VERSION", "AYON Info")
+ else:
+ version_string = openpype.version.__version__
if subversion:
version_string += " ({})".format(subversion)
@@ -632,6 +635,14 @@ class TrayManager:
self.exit()
elif result.restart or result.token_changed:
+ # Remove environment variables from current connection
+ # - keep develop, staging, headless values
+ for key in {
+ "AYON_SERVER_URL",
+ "AYON_API_KEY",
+ "AYON_BUNDLE_NAME",
+ }:
+ os.environ.pop(key, None)
self.restart()
def _on_restart_action(self):
diff --git a/openpype/vendor/python/common/ayon_api/__init__.py b/openpype/vendor/python/common/ayon_api/__init__.py
index dc3d361f46..cc15ad9170 100644
--- a/openpype/vendor/python/common/ayon_api/__init__.py
+++ b/openpype/vendor/python/common/ayon_api/__init__.py
@@ -75,8 +75,6 @@ from ._api import (
download_installer,
upload_installer,
- get_dependencies_info,
- update_dependency_info,
get_dependency_packages,
create_dependency_package,
update_dependency_package,
@@ -277,8 +275,6 @@ __all__ = (
"download_installer",
"upload_installer",
- "get_dependencies_info",
- "update_dependency_info",
"get_dependency_packages",
"create_dependency_package",
"update_dependency_package",
diff --git a/openpype/vendor/python/common/ayon_api/_api.py b/openpype/vendor/python/common/ayon_api/_api.py
index 9f89d3d59e..a0374a08b9 100644
--- a/openpype/vendor/python/common/ayon_api/_api.py
+++ b/openpype/vendor/python/common/ayon_api/_api.py
@@ -374,7 +374,7 @@ def get_default_settings_variant():
"""
con = get_server_api_connection()
- return con.get_client_version()
+ return con.get_default_settings_variant()
def set_default_settings_variant(variant):
@@ -611,16 +611,6 @@ def upload_installer(*args, **kwargs):
# Dependency packages
-def get_dependencies_info(*args, **kwargs):
- con = get_server_api_connection()
- return con.get_dependencies_info(*args, **kwargs)
-
-
-def update_dependency_info(*args, **kwargs):
- con = get_server_api_connection()
- return con.update_dependency_info(*args, **kwargs)
-
-
def download_dependency_package(*args, **kwargs):
con = get_server_api_connection()
return con.download_dependency_package(*args, **kwargs)
diff --git a/openpype/vendor/python/common/ayon_api/constants.py b/openpype/vendor/python/common/ayon_api/constants.py
index eaeb77b607..c31940d93a 100644
--- a/openpype/vendor/python/common/ayon_api/constants.py
+++ b/openpype/vendor/python/common/ayon_api/constants.py
@@ -3,6 +3,10 @@ SERVER_URL_ENV_KEY = "AYON_SERVER_URL"
SERVER_API_ENV_KEY = "AYON_API_KEY"
SERVER_TIMEOUT_ENV_KEY = "AYON_SERVER_TIMEOUT"
SERVER_RETRIES_ENV_KEY = "AYON_SERVER_RETRIES"
+# Default variant used for settings
+DEFAULT_VARIANT_ENV_KEY = "AYON_DEFAULT_SETTINGS_VARIANT"
+# Default site id used for connection
+SITE_ID_ENV_KEY = "AYON_SITE_ID"
# Backwards compatibility
SERVER_TOKEN_ENV_KEY = SERVER_API_ENV_KEY
@@ -40,6 +44,7 @@ DEFAULT_PROJECT_FIELDS = {
"code",
"config",
"createdAt",
+ "data",
}
# --- Folders ---
@@ -52,6 +57,7 @@ DEFAULT_FOLDER_FIELDS = {
"parentId",
"active",
"thumbnailId",
+ "data",
}
# --- Tasks ---
@@ -63,6 +69,7 @@ DEFAULT_TASK_FIELDS = {
"folderId",
"active",
"assignees",
+ "data",
}
# --- Products ---
@@ -72,6 +79,7 @@ DEFAULT_PRODUCT_FIELDS = {
"folderId",
"active",
"productType",
+ "data",
}
# --- Versions ---
@@ -86,6 +94,7 @@ DEFAULT_VERSION_FIELDS = {
"thumbnailId",
"createdAt",
"updatedAt",
+ "data",
}
# --- Representations ---
@@ -96,6 +105,7 @@ DEFAULT_REPRESENTATION_FIELDS = {
"createdAt",
"active",
"versionId",
+ "data",
}
REPRESENTATION_FILES_FIELDS = {
@@ -119,6 +129,7 @@ DEFAULT_WORKFILE_INFO_FIELDS = {
"thumbnailId",
"updatedAt",
"updatedBy",
+ "data",
}
DEFAULT_EVENT_FIELDS = {
diff --git a/openpype/vendor/python/common/ayon_api/entity_hub.py b/openpype/vendor/python/common/ayon_api/entity_hub.py
index b9b017bac5..f894c428a8 100644
--- a/openpype/vendor/python/common/ayon_api/entity_hub.py
+++ b/openpype/vendor/python/common/ayon_api/entity_hub.py
@@ -7,9 +7,21 @@ import six
from ._api import get_server_api_connection
from .utils import create_entity_id, convert_entity_id, slugify_string
-UNKNOWN_VALUE = object()
-PROJECT_PARENT_ID = object()
-_NOT_SET = object()
+
+class _CustomNone(object):
+ def __init__(self, name=None):
+ self._name = name or "CustomNone"
+
+ def __repr__(self):
+ return "<{}>".format(self._name)
+
+ def __bool__(self):
+ return False
+
+
+UNKNOWN_VALUE = _CustomNone("UNKNOWN_VALUE")
+PROJECT_PARENT_ID = _CustomNone("PROJECT_PARENT_ID")
+_NOT_SET = _CustomNone("_NOT_SET")
class EntityHub(object):
@@ -36,11 +48,20 @@ class EntityHub(object):
"""
def __init__(
- self, project_name, connection=None, allow_data_changes=False
+ self, project_name, connection=None, allow_data_changes=None
):
if not connection:
connection = get_server_api_connection()
+ major, minor, patch, _, _ = connection.server_version_tuple
+ path_start_with_slash = True
+ if (major, minor) < (0, 6):
+ path_start_with_slash = False
+
+ if allow_data_changes is None:
+ allow_data_changes = connection.graphql_allows_data_in_query
+
self._connection = connection
+ self._path_start_with_slash = path_start_with_slash
self._project_name = project_name
self._entities_by_id = {}
@@ -65,6 +86,18 @@ class EntityHub(object):
return self._allow_data_changes
+ @property
+ def path_start_with_slash(self):
+ """Folder path should start with slash.
+
+ This changed in 0.6.x server version.
+
+ Returns:
+ bool: Path starts with slash.
+ """
+
+ return self._path_start_with_slash
+
@property
def project_name(self):
"""Project name which is maintained by hub.
@@ -1263,7 +1296,10 @@ class BaseEntity(object):
changes["name"] = self._name
if self._entity_hub.allow_data_changes:
- if self._orig_data != self._data:
+ if (
+ self._data is not UNKNOWN_VALUE
+ and self._orig_data != self._data
+ ):
changes["data"] = self._data
if self._orig_thumbnail_id != self._thumbnail_id:
@@ -2419,10 +2455,13 @@ class FolderEntity(BaseEntity):
if self._path is None:
parent = self.parent
- path = self.name
if parent.entity_type == "folder":
parent_path = parent.path
- path = "/".join([parent_path, path])
+ path = "/".join([parent_path, self.name])
+ elif self._entity_hub.path_start_with_slash:
+ path = "/{}".format(self.name)
+ else:
+ path = self.name
self._path = path
return self._path
@@ -2525,7 +2564,10 @@ class FolderEntity(BaseEntity):
if self.thumbnail_id is not UNKNOWN_VALUE:
output["thumbnailId"] = self.thumbnail_id
- if self._entity_hub.allow_data_changes:
+ if (
+ self._entity_hub.allow_data_changes
+ and self._data is not UNKNOWN_VALUE
+ ):
output["data"] = self._data
return output
diff --git a/openpype/vendor/python/common/ayon_api/graphql.py b/openpype/vendor/python/common/ayon_api/graphql.py
index 854f207a00..2594b45966 100644
--- a/openpype/vendor/python/common/ayon_api/graphql.py
+++ b/openpype/vendor/python/common/ayon_api/graphql.py
@@ -202,6 +202,15 @@ class GraphQlQuery:
self._variables[key]["value"] = value
+ def get_variable_keys(self):
+ """Get all variable keys.
+
+ Returns:
+ set[str]: Variable keys.
+ """
+
+ return set(self._variables.keys())
+
def get_variables_values(self):
"""Calculate variable values used that should be used in query.
diff --git a/openpype/vendor/python/common/ayon_api/graphql_queries.py b/openpype/vendor/python/common/ayon_api/graphql_queries.py
index cedb3ed2ac..f121a5649f 100644
--- a/openpype/vendor/python/common/ayon_api/graphql_queries.py
+++ b/openpype/vendor/python/common/ayon_api/graphql_queries.py
@@ -175,10 +175,15 @@ def folders_graphql_query(fields):
folder_ids_var = query.add_variable("folderIds", "[String!]")
parent_folder_ids_var = query.add_variable("parentFolderIds", "[String!]")
folder_paths_var = query.add_variable("folderPaths", "[String!]")
+ folder_path_regex_var = query.add_variable("folderPathRegex", "String!")
folder_names_var = query.add_variable("folderNames", "[String!]")
folder_types_var = query.add_variable("folderTypes", "[String!]")
- statuses_var = query.add_variable("folderStatuses", "[String!]")
has_products_var = query.add_variable("folderHasProducts", "Boolean!")
+ has_tasks_var = query.add_variable("folderHasTasks", "Boolean!")
+ has_links_var = query.add_variable("folderHasLinks", "HasLinksFilter")
+ has_children_var = query.add_variable("folderHasChildren", "Boolean!")
+ statuses_var = query.add_variable("folderStatuses", "[String!]")
+ tags_var = query.add_variable("folderTags", "[String!]")
project_field = query.add_field("project")
project_field.set_filter("name", project_name_var)
@@ -188,9 +193,14 @@ def folders_graphql_query(fields):
folders_field.set_filter("parentIds", parent_folder_ids_var)
folders_field.set_filter("names", folder_names_var)
folders_field.set_filter("paths", folder_paths_var)
+ folders_field.set_filter("pathEx", folder_path_regex_var)
folders_field.set_filter("folderTypes", folder_types_var)
folders_field.set_filter("statuses", statuses_var)
+ folders_field.set_filter("tags", tags_var)
folders_field.set_filter("hasProducts", has_products_var)
+ folders_field.set_filter("hasTasks", has_tasks_var)
+ folders_field.set_filter("hasLinks", has_links_var)
+ folders_field.set_filter("hasChildren", has_children_var)
nested_fields = fields_to_dict(fields)
add_links_fields(folders_field, nested_fields)
@@ -218,6 +228,10 @@ def tasks_graphql_query(fields):
task_names_var = query.add_variable("taskNames", "[String!]")
task_types_var = query.add_variable("taskTypes", "[String!]")
folder_ids_var = query.add_variable("folderIds", "[String!]")
+ assignees_any_var = query.add_variable("taskAssigneesAny", "[String!]")
+ assignees_all_var = query.add_variable("taskAssigneesAll", "[String!]")
+ statuses_var = query.add_variable("taskStatuses", "[String!]")
+ tags_var = query.add_variable("taskTags", "[String!]")
project_field = query.add_field("project")
project_field.set_filter("name", project_name_var)
@@ -228,6 +242,10 @@ def tasks_graphql_query(fields):
tasks_field.set_filter("names", task_names_var)
tasks_field.set_filter("taskTypes", task_types_var)
tasks_field.set_filter("folderIds", folder_ids_var)
+ tasks_field.set_filter("assigneesAny", assignees_any_var)
+ tasks_field.set_filter("assignees", assignees_all_var)
+ tasks_field.set_filter("statuses", statuses_var)
+ tasks_field.set_filter("tags", tags_var)
nested_fields = fields_to_dict(fields)
add_links_fields(tasks_field, nested_fields)
@@ -256,7 +274,10 @@ def products_graphql_query(fields):
product_names_var = query.add_variable("productNames", "[String!]")
folder_ids_var = query.add_variable("folderIds", "[String!]")
product_types_var = query.add_variable("productTypes", "[String!]")
- statuses_var = query.add_variable("statuses", "[String!]")
+ product_name_regex_var = query.add_variable("productNameRegex", "String!")
+ product_path_regex_var = query.add_variable("productPathRegex", "String!")
+ statuses_var = query.add_variable("productStatuses.", "[String!]")
+ tags_var = query.add_variable("productTags.", "[String!]")
project_field = query.add_field("project")
project_field.set_filter("name", project_name_var)
@@ -267,6 +288,9 @@ def products_graphql_query(fields):
products_field.set_filter("folderIds", folder_ids_var)
products_field.set_filter("productTypes", product_types_var)
products_field.set_filter("statuses", statuses_var)
+ products_field.set_filter("tags", tags_var)
+ products_field.set_filter("nameEx", product_name_regex_var)
+ products_field.set_filter("pathEx", product_path_regex_var)
nested_fields = fields_to_dict(set(fields))
add_links_fields(products_field, nested_fields)
@@ -299,24 +323,28 @@ def versions_graphql_query(fields):
hero_or_latest_only_var = query.add_variable(
"heroOrLatestOnly", "Boolean"
)
+ statuses_var = query.add_variable("versionStatuses", "[String!]")
+ tags_var = query.add_variable("versionTags", "[String!]")
project_field = query.add_field("project")
project_field.set_filter("name", project_name_var)
- products_field = project_field.add_field_with_edges("versions")
- products_field.set_filter("ids", version_ids_var)
- products_field.set_filter("productIds", product_ids_var)
- products_field.set_filter("versions", versions_var)
- products_field.set_filter("heroOnly", hero_only_var)
- products_field.set_filter("latestOnly", latest_only_var)
- products_field.set_filter("heroOrLatestOnly", hero_or_latest_only_var)
+ versions_field = project_field.add_field_with_edges("versions")
+ versions_field.set_filter("ids", version_ids_var)
+ versions_field.set_filter("productIds", product_ids_var)
+ versions_field.set_filter("versions", versions_var)
+ versions_field.set_filter("heroOnly", hero_only_var)
+ versions_field.set_filter("latestOnly", latest_only_var)
+ versions_field.set_filter("heroOrLatestOnly", hero_or_latest_only_var)
+ versions_field.set_filter("statuses", statuses_var)
+ versions_field.set_filter("tags", tags_var)
nested_fields = fields_to_dict(set(fields))
- add_links_fields(products_field, nested_fields)
+ add_links_fields(versions_field, nested_fields)
query_queue = collections.deque()
for key, value in nested_fields.items():
- query_queue.append((key, value, products_field))
+ query_queue.append((key, value, versions_field))
while query_queue:
item = query_queue.popleft()
@@ -337,6 +365,13 @@ def representations_graphql_query(fields):
repre_ids_var = query.add_variable("representationIds", "[String!]")
repre_names_var = query.add_variable("representationNames", "[String!]")
version_ids_var = query.add_variable("versionIds", "[String!]")
+ has_links_var = query.add_variable("representationHasLinks", "HasLinksFilter")
+ statuses_var = query.add_variable(
+ "representationStatuses", "[String!]"
+ )
+ tags_var = query.add_variable(
+ "representationTags", "[String!]"
+ )
project_field = query.add_field("project")
project_field.set_filter("name", project_name_var)
@@ -345,6 +380,9 @@ def representations_graphql_query(fields):
repres_field.set_filter("ids", repre_ids_var)
repres_field.set_filter("versionIds", version_ids_var)
repres_field.set_filter("names", repre_names_var)
+ repres_field.set_filter("hasLinks", has_links_var)
+ repres_field.set_filter("statuses", statuses_var)
+ repres_field.set_filter("tags", tags_var)
nested_fields = fields_to_dict(set(fields))
add_links_fields(repres_field, nested_fields)
@@ -412,6 +450,10 @@ def workfiles_info_graphql_query(fields):
workfiles_info_ids = query.add_variable("workfileIds", "[String!]")
task_ids_var = query.add_variable("taskIds", "[String!]")
paths_var = query.add_variable("paths", "[String!]")
+ path_regex_var = query.add_variable("workfilePathRegex", "String!")
+ has_links_var = query.add_variable("workfilehasLinks", "HasLinksFilter")
+ statuses_var = query.add_variable("workfileStatuses", "[String!]")
+ tags_var = query.add_variable("workfileTags", "[String!]")
project_field = query.add_field("project")
project_field.set_filter("name", project_name_var)
@@ -420,6 +462,10 @@ def workfiles_info_graphql_query(fields):
workfiles_field.set_filter("ids", workfiles_info_ids)
workfiles_field.set_filter("taskIds", task_ids_var)
workfiles_field.set_filter("paths", paths_var)
+ workfiles_field.set_filter("pathEx", path_regex_var)
+ workfiles_field.set_filter("hasLinks", has_links_var)
+ workfiles_field.set_filter("statuses", statuses_var)
+ workfiles_field.set_filter("tags", tags_var)
nested_fields = fields_to_dict(set(fields))
add_links_fields(workfiles_field, nested_fields)
@@ -447,6 +493,9 @@ def events_graphql_query(fields):
states_var = query.add_variable("eventStates", "[String!]")
users_var = query.add_variable("eventUsers", "[String!]")
include_logs_var = query.add_variable("includeLogsFilter", "Boolean!")
+ has_children_var = query.add_variable("hasChildrenFilter", "Boolean!")
+ newer_than_var = query.add_variable("newerThanFilter", "String!")
+ older_than_var = query.add_variable("olderThanFilter", "String!")
events_field = query.add_field_with_edges("events")
events_field.set_filter("topics", topics_var)
@@ -454,6 +503,9 @@ def events_graphql_query(fields):
events_field.set_filter("states", states_var)
events_field.set_filter("users", users_var)
events_field.set_filter("includeLogs", include_logs_var)
+ events_field.set_filter("hasChildren", has_children_var)
+ events_field.set_filter("newerThan", newer_than_var)
+ events_field.set_filter("olderThan", older_than_var)
nested_fields = fields_to_dict(set(fields))
diff --git a/openpype/vendor/python/common/ayon_api/server_api.py b/openpype/vendor/python/common/ayon_api/server_api.py
index 3bac59c192..4aed4e811a 100644
--- a/openpype/vendor/python/common/ayon_api/server_api.py
+++ b/openpype/vendor/python/common/ayon_api/server_api.py
@@ -8,7 +8,11 @@ import collections
import platform
import copy
import uuid
+import warnings
from contextlib import contextmanager
+
+import six
+
try:
from http import HTTPStatus
except ImportError:
@@ -27,7 +31,6 @@ except ImportError:
from json import JSONDecodeError as RequestsJSONDecodeError
from .constants import (
- SERVER_TIMEOUT_ENV_KEY,
SERVER_RETRIES_ENV_KEY,
DEFAULT_PRODUCT_TYPE_FIELDS,
DEFAULT_PROJECT_FIELDS,
@@ -76,8 +79,11 @@ from .utils import (
create_dependency_package_basename,
ThumbnailContent,
get_default_timeout,
+ get_default_settings_variant,
+ get_default_site_id,
)
+_PLACEHOLDER = object()
PatternType = type(re.compile(""))
JSONDecodeError = getattr(json, "JSONDecodeError", ValueError)
# This should be collected from server schema
@@ -176,6 +182,11 @@ class RestApiResponse(object):
return self.status
def raise_for_status(self, message=None):
+ if self._response is None:
+ if self._data and self._data.get("detail"):
+ raise ServerError(self._data["detail"])
+ raise ValueError("Response is not available.")
+
try:
self._response.raise_for_status()
except requests.exceptions.HTTPError as exc:
@@ -353,12 +364,16 @@ class ServerAPI(object):
max_retries (Optional[int]): Number of retries for requests.
"""
_default_max_retries = 3
+ # 1 MB chunk by default
+ # TODO find out if these are reasonable default value
+ default_download_chunk_size = 1024 * 1024
+ default_upload_chunk_size = 1024 * 1024
def __init__(
self,
base_url,
token=None,
- site_id=None,
+ site_id=_PLACEHOLDER,
client_version=None,
default_settings_variant=None,
sender=None,
@@ -377,11 +392,14 @@ class ServerAPI(object):
self._graphql_url = "{}/graphql".format(base_url)
self._log = None
self._access_token = token
+ # Allow to have 'site_id' to 'None'
+ if site_id is _PLACEHOLDER:
+ site_id = get_default_site_id()
self._site_id = site_id
self._client_version = client_version
self._default_settings_variant = (
default_settings_variant
- or "production"
+ or get_default_settings_variant()
)
self._sender = sender
@@ -411,6 +429,8 @@ class ServerAPI(object):
self._server_version = None
self._server_version_tuple = None
+ self._graphql_allows_data_in_query = None
+
self._session = None
self._base_functions_mapping = {
@@ -936,6 +956,26 @@ class ServerAPI(object):
server_version = property(get_server_version)
server_version_tuple = property(get_server_version_tuple)
+ @property
+ def graphql_allows_data_in_query(self):
+ """GraphlQl query can support 'data' field.
+
+ This applies only to project hierarchy entities 'project', 'folder',
+ 'task', 'product', 'version' and 'representation'. Others like 'user'
+ still require to use rest api to access 'data'.
+
+ Returns:
+ bool: True if server supports 'data' field in GraphQl query.
+ """
+
+ if self._graphql_allows_data_in_query is None:
+ major, minor, patch, _, _ = self.server_version_tuple
+ graphql_allows_data_in_query = True
+ if (major, minor, patch) < (0, 5, 5):
+ graphql_allows_data_in_query = False
+ self._graphql_allows_data_in_query = graphql_allows_data_in_query
+ return self._graphql_allows_data_in_query
+
def _get_user_info(self):
if self._access_token is None:
return None
@@ -983,17 +1023,10 @@ class ServerAPI(object):
for attr, filter_value in filters.items():
query.set_variable_value(attr, filter_value)
- # Backwards compatibility for server 0.3.x
- # - will be removed in future releases
- major, minor, _, _, _ = self.server_version_tuple
- access_groups_field = "accessGroups"
- if major == 0 and minor <= 3:
- access_groups_field = "roles"
-
for parsed_data in query.continuous_query(self):
for user in parsed_data["users"]:
- user[access_groups_field] = json.loads(
- user[access_groups_field])
+ user["accessGroups"] = json.loads(
+ user["accessGroups"])
yield user
def get_user(self, username=None):
@@ -1279,6 +1312,9 @@ class ServerAPI(object):
states=None,
users=None,
include_logs=None,
+ has_children=None,
+ newer_than=None,
+ older_than=None,
fields=None
):
"""Get events from server with filtering options.
@@ -1294,6 +1330,12 @@ class ServerAPI(object):
users (Optional[Iterable[str]]): Filtering by users
who created/triggered an event.
include_logs (Optional[bool]): Query also log events.
+ has_children (Optional[bool]): Event is with/without children
+ events. If 'None' then all events are returned, default.
+ newer_than (Optional[str]): Return only events newer than given
+ iso datetime string.
+ older_than (Optional[str]): Return only events older than given
+ iso datetime string.
fields (Optional[Iterable[str]]): Fields that should be received
for each event.
@@ -1330,6 +1372,15 @@ class ServerAPI(object):
include_logs = False
filters["includeLogsFilter"] = include_logs
+ if has_children is not None:
+ filters["hasChildrenFilter"] = has_children
+
+ if newer_than is not None:
+ filters["newerThanFilter"] = newer_than
+
+ if older_than is not None:
+ filters["olderThanFilter"] = older_than
+
if not fields:
fields = self.get_default_fields_for_type("event")
@@ -1512,8 +1563,9 @@ class ServerAPI(object):
"sourceTopic": source_topic,
"targetTopic": target_topic,
"sender": sender,
- "maxRetries": max_retries,
}
+ if max_retries is not None:
+ kwargs["maxRetries"] = max_retries
if sequential is not None:
kwargs["sequential"] = sequential
if description is not None:
@@ -1560,6 +1612,10 @@ class ServerAPI(object):
download happens in thread and other thread want to catch changes over
time.
+ Todos:
+ Use retries and timeout.
+ Return RestApiResponse.
+
Args:
endpoint (str): Endpoint or URL to file that should be downloaded.
filepath (str): Path where file will be downloaded.
@@ -1570,8 +1626,7 @@ class ServerAPI(object):
"""
if not chunk_size:
- # 1 MB chunk by default
- chunk_size = 1024 * 1024
+ chunk_size = self.default_download_chunk_size
if endpoint.startswith(self._base_url):
url = endpoint
@@ -1598,33 +1653,93 @@ class ServerAPI(object):
progress.set_transfer_done()
return progress
- def _upload_file(self, url, filepath, progress, request_type=None):
+ @staticmethod
+ def _upload_chunks_iter(file_stream, progress, chunk_size):
+ """Generator that yields chunks of file.
+
+ Args:
+ file_stream (io.BinaryIO): Byte stream.
+ progress (TransferProgress): Object to track upload progress.
+ chunk_size (int): Size of chunks that are uploaded at once.
+
+ Yields:
+ bytes: Chunk of file.
+ """
+
+ # Get size of file
+ file_stream.seek(0, io.SEEK_END)
+ size = file_stream.tell()
+ file_stream.seek(0)
+ # Set content size to progress object
+ progress.set_content_size(size)
+
+ while True:
+ chunk = file_stream.read(chunk_size)
+ if not chunk:
+ break
+ progress.add_transferred_chunk(len(chunk))
+ yield chunk
+
+ def _upload_file(
+ self,
+ url,
+ filepath,
+ progress,
+ request_type=None,
+ chunk_size=None,
+ **kwargs
+ ):
+ """
+
+ Args:
+ url (str): Url where file will be uploaded.
+ filepath (str): Source filepath.
+ progress (TransferProgress): Object that gives ability to track
+ progress.
+ request_type (Optional[RequestType]): Type of request that will
+ be used. Default is PUT.
+ chunk_size (Optional[int]): Size of chunks that are uploaded
+ at once.
+ **kwargs (Any): Additional arguments that will be passed
+ to request function.
+
+ Returns:
+ RestApiResponse: Server response.
+ """
+
if request_type is None:
request_type = RequestTypes.put
- kwargs = {}
+
if self._session is None:
- kwargs["headers"] = self.get_headers()
+ headers = kwargs.setdefault("headers", {})
+ for key, value in self.get_headers().items():
+ if key not in headers:
+ headers[key] = value
post_func = self._base_functions_mapping[request_type]
else:
post_func = self._session_functions_mapping[request_type]
+ if not chunk_size:
+ chunk_size = self.default_upload_chunk_size
+
with open(filepath, "rb") as stream:
- stream.seek(0, io.SEEK_END)
- size = stream.tell()
- stream.seek(0)
- progress.set_content_size(size)
- response = post_func(url, data=stream, **kwargs)
+ response = post_func(
+ url,
+ data=self._upload_chunks_iter(stream, progress, chunk_size),
+ **kwargs
+ )
+
response.raise_for_status()
- progress.set_transferred_size(size)
return response
def upload_file(
- self, endpoint, filepath, progress=None, request_type=None
+ self, endpoint, filepath, progress=None, request_type=None, **kwargs
):
"""Upload file to server.
Todos:
- Uploading with more detailed progress.
+ Use retries and timeout.
+ Return RestApiResponse.
Args:
endpoint (str): Endpoint or url where file will be uploaded.
@@ -1633,6 +1748,8 @@ class ServerAPI(object):
to track upload progress.
request_type (Optional[RequestType]): Type of request that will
be used to upload file.
+ **kwargs (Any): Additional arguments that will be passed
+ to request function.
Returns:
requests.Response: Response object.
@@ -1654,7 +1771,9 @@ class ServerAPI(object):
progress.set_started()
try:
- return self._upload_file(url, filepath, progress, request_type)
+ return self._upload_file(
+ url, filepath, progress, request_type, **kwargs
+ )
except Exception as exc:
progress.set_failed(str(exc))
@@ -1877,42 +1996,48 @@ class ServerAPI(object):
return set(DEFAULT_EVENT_FIELDS)
if entity_type == "project":
- entity_type_defaults = DEFAULT_PROJECT_FIELDS
+ entity_type_defaults = set(DEFAULT_PROJECT_FIELDS)
+ if not self.graphql_allows_data_in_query:
+ entity_type_defaults.discard("data")
elif entity_type == "folder":
- entity_type_defaults = DEFAULT_FOLDER_FIELDS
+ entity_type_defaults = set(DEFAULT_FOLDER_FIELDS)
+ if not self.graphql_allows_data_in_query:
+ entity_type_defaults.discard("data")
elif entity_type == "task":
- entity_type_defaults = DEFAULT_TASK_FIELDS
+ entity_type_defaults = set(DEFAULT_TASK_FIELDS)
+ if not self.graphql_allows_data_in_query:
+ entity_type_defaults.discard("data")
elif entity_type == "product":
- entity_type_defaults = DEFAULT_PRODUCT_FIELDS
+ entity_type_defaults = set(DEFAULT_PRODUCT_FIELDS)
+ if not self.graphql_allows_data_in_query:
+ entity_type_defaults.discard("data")
elif entity_type == "version":
- entity_type_defaults = DEFAULT_VERSION_FIELDS
+ entity_type_defaults = set(DEFAULT_VERSION_FIELDS)
+ if not self.graphql_allows_data_in_query:
+ entity_type_defaults.discard("data")
elif entity_type == "representation":
entity_type_defaults = (
DEFAULT_REPRESENTATION_FIELDS
| REPRESENTATION_FILES_FIELDS
)
+ if not self.graphql_allows_data_in_query:
+ entity_type_defaults.discard("data")
elif entity_type == "productType":
- entity_type_defaults = DEFAULT_PRODUCT_TYPE_FIELDS
+ entity_type_defaults = set(DEFAULT_PRODUCT_TYPE_FIELDS)
elif entity_type == "workfile":
- entity_type_defaults = DEFAULT_WORKFILE_INFO_FIELDS
+ entity_type_defaults = set(DEFAULT_WORKFILE_INFO_FIELDS)
+ if not self.graphql_allows_data_in_query:
+ entity_type_defaults.discard("data")
elif entity_type == "user":
entity_type_defaults = set(DEFAULT_USER_FIELDS)
- # Backwards compatibility for server 0.3.x
- # - will be removed in future releases
- major, minor, _, _, _ = self.server_version_tuple
- if major == 0 and minor <= 3:
- entity_type_defaults.discard("accessGroups")
- entity_type_defaults.discard("defaultAccessGroups")
- entity_type_defaults.add("roles")
- entity_type_defaults.add("defaultRoles")
else:
raise ValueError("Unknown entity type \"{}\"".format(entity_type))
@@ -2167,125 +2292,8 @@ class ServerAPI(object):
progress=progress
)
- def get_dependencies_info(self):
- """Information about dependency packages on server.
-
- Example data structure:
- {
- "packages": [
- {
- "name": str,
- "platform": str,
- "checksum": str,
- "sources": list[dict[str, Any]],
- "supportedAddons": dict[str, str],
- "pythonModules": dict[str, str]
- }
- ],
- "productionPackage": str
- }
-
- Deprecated:
- Deprecated since server version 0.2.1. Use
- 'get_dependency_packages' instead.
-
- Returns:
- dict[str, Any]: Information about dependency packages known for
- server.
- """
-
- major, minor, patch, _, _ = self.server_version_tuple
- if major == 0 and (minor < 2 or (minor == 2 and patch < 1)):
- result = self.get("dependencies")
- return result.data
- packages = self.get_dependency_packages()
- packages["productionPackage"] = None
- return packages
-
- def update_dependency_info(
- self,
- name,
- platform_name,
- size,
- checksum,
- checksum_algorithm=None,
- supported_addons=None,
- python_modules=None,
- sources=None
- ):
- """Update or create dependency package for identifiers.
-
- The endpoint can be used to create or update dependency package.
-
-
- Deprecated:
- Deprecated for server version 0.2.1. Use
- 'create_dependency_pacakge' instead.
-
- Args:
- name (str): Name of dependency package.
- platform_name (Literal["windows", "linux", "darwin"]): Platform
- for which is dependency package targeted.
- size (int): Size of dependency package in bytes.
- checksum (str): Checksum of archive file where dependencies are.
- checksum_algorithm (Optional[str]): Algorithm used to calculate
- checksum. By default, is used 'md5' (defined by server).
- supported_addons (Optional[dict[str, str]]): Name of addons for
- which was the package created.
- '{"": "", ...}'
- python_modules (Optional[dict[str, str]]): Python modules in
- dependencies package.
- '{"": "", ...}'
- sources (Optional[list[dict[str, Any]]]): Information about
- sources where dependency package is available.
- """
-
- kwargs = {
- key: value
- for key, value in (
- ("checksumAlgorithm", checksum_algorithm),
- ("supportedAddons", supported_addons),
- ("pythonModules", python_modules),
- ("sources", sources),
- )
- if value
- }
-
- response = self.put(
- "dependencies",
- name=name,
- platform=platform_name,
- size=size,
- checksum=checksum,
- **kwargs
- )
- response.raise_for_status("Failed to create/update dependency")
- return response.data
-
- def _get_dependency_package_route(
- self, filename=None, platform_name=None
- ):
- major, minor, patch, _, _ = self.server_version_tuple
- if (major, minor, patch) <= (0, 2, 0):
- # Backwards compatibility for AYON server 0.2.0 and lower
- self.log.warning((
- "Using deprecated dependency package route."
- " Please update your AYON server to version 0.2.1 or higher."
- " Backwards compatibility for this route will be removed"
- " in future releases of ayon-python-api."
- ))
- if platform_name is None:
- platform_name = platform.system().lower()
- base = "dependencies"
- if not filename:
- return base
- return "{}/{}/{}".format(base, filename, platform_name)
-
- if (major, minor) <= (0, 3):
- endpoint = "desktop/dependency_packages"
- else:
- endpoint = "desktop/dependencyPackages"
-
+ def _get_dependency_package_route(self, filename=None):
+ endpoint = "desktop/dependencyPackages"
if filename:
return "{}/{}".format(endpoint, filename)
return endpoint
@@ -2396,14 +2404,21 @@ class ServerAPI(object):
"""Remove dependency package for specific platform.
Args:
- filename (str): Filename of dependency package. Or name of package
- for server version 0.2.0 or lower.
- platform_name (Optional[str]): Which platform of the package
- should be removed. Current platform is used if not passed.
- Deprecated since version 0.2.1
+ filename (str): Filename of dependency package.
+ platform_name (Optional[str]): Deprecated.
"""
- route = self._get_dependency_package_route(filename, platform_name)
+ if platform_name is not None:
+ warnings.warn(
+ (
+ "Argument 'platform_name' is deprecated in"
+ " 'delete_dependency_package'. The argument will be"
+ " removed, please modify your code accordingly."
+ ),
+ DeprecationWarning
+ )
+
+ route = self._get_dependency_package_route(filename)
response = self.delete(route)
response.raise_for_status("Failed to delete dependency file")
return response.data
@@ -2428,18 +2443,25 @@ class ServerAPI(object):
to download.
dst_directory (str): Where the file should be downloaded.
dst_filename (str): Name of destination filename.
- platform_name (Optional[str]): Name of platform for which the
- dependency package is targeted. Default value is
- current platform. Deprecated since server version 0.2.1.
+ platform_name (Optional[str]): Deprecated.
chunk_size (Optional[int]): Download chunk size.
progress (Optional[TransferProgress]): Object that gives ability
to track download progress.
Returns:
str: Filepath to downloaded file.
- """
+ """
- route = self._get_dependency_package_route(src_filename, platform_name)
+ if platform_name is not None:
+ warnings.warn(
+ (
+ "Argument 'platform_name' is deprecated in"
+ " 'download_dependency_package'. The argument will be"
+ " removed, please modify your code accordingly."
+ ),
+ DeprecationWarning
+ )
+ route = self._get_dependency_package_route(src_filename)
package_filepath = os.path.join(dst_directory, dst_filename)
self.download_file(
route,
@@ -2458,32 +2480,24 @@ class ServerAPI(object):
src_filepath (str): Path to a package file.
dst_filename (str): Dependency package filename or name of package
for server version 0.2.0 or lower. Must be unique.
- platform_name (Optional[str]): For which platform is the
- package targeted. Deprecated since server version 0.2.1.
+ platform_name (Optional[str]): Deprecated.
progress (Optional[TransferProgress]): Object to keep track about
upload state.
"""
- route = self._get_dependency_package_route(dst_filename, platform_name)
+ if platform_name is not None:
+ warnings.warn(
+ (
+ "Argument 'platform_name' is deprecated in"
+ " 'upload_dependency_package'. The argument will be"
+ " removed, please modify your code accordingly."
+ ),
+ DeprecationWarning
+ )
+
+ route = self._get_dependency_package_route(dst_filename)
self.upload_file(route, src_filepath, progress=progress)
- def create_dependency_package_basename(self, platform_name=None):
- """Create basename for dependency package file.
-
- Deprecated:
- Use 'create_dependency_package_basename' from `ayon_api` or
- `ayon_api.utils` instead.
-
- Args:
- platform_name (Optional[str]): Name of platform for which the
- bundle is targeted. Default value is current platform.
-
- Returns:
- str: Dependency package name with timestamp and platform.
- """
-
- return create_dependency_package_basename(platform_name)
-
def upload_addon_zip(self, src_filepath, progress=None):
"""Upload addon zip file to server.
@@ -2511,14 +2525,6 @@ class ServerAPI(object):
)
return response.json()
- def _get_bundles_route(self):
- major, minor, patch, _, _ = self.server_version_tuple
- # Backwards compatibility for AYON server 0.3.0
- # - first version where bundles were available
- if major == 0 and minor == 3 and patch == 0:
- return "desktop/bundles"
- return "bundles"
-
def get_bundles(self):
"""Server bundles with basic information.
@@ -2549,7 +2555,7 @@ class ServerAPI(object):
dict[str, Any]: Server bundles with basic information.
"""
- response = self.get(self._get_bundles_route())
+ response = self.get("bundles")
response.raise_for_status()
return response.data
@@ -2592,7 +2598,7 @@ class ServerAPI(object):
if value is not None:
body[key] = value
- response = self.post(self._get_bundles_route(), **body)
+ response = self.post("bundles", **body)
response.raise_for_status()
def update_bundle(
@@ -2627,7 +2633,7 @@ class ServerAPI(object):
if value is not None
}
response = self.patch(
- "{}/{}".format(self._get_bundles_route(), bundle_name),
+ "{}/{}".format("bundles", bundle_name),
**body
)
response.raise_for_status()
@@ -2640,7 +2646,7 @@ class ServerAPI(object):
"""
response = self.delete(
- "{}/{}".format(self._get_bundles_route(), bundle_name)
+ "{}/{}".format("bundles", bundle_name)
)
response.raise_for_status()
@@ -2963,16 +2969,13 @@ class ServerAPI(object):
- test how it behaves if there is not any production/staging
bundle.
- Warnings:
- For AYON server < 0.3.0 bundle name will be ignored.
-
Example output:
{
"addons": [
{
"name": "addon-name",
"version": "addon-version",
- "settings": {...}
+ "settings": {...},
"siteSettings": {...}
}
]
@@ -2982,7 +2985,6 @@ class ServerAPI(object):
dict[str, Any]: All settings for single bundle.
"""
- major, minor, _, _, _ = self.server_version_tuple
query_values = {
key: value
for key, value in (
@@ -2998,21 +3000,8 @@ class ServerAPI(object):
if site_id:
query_values["site_id"] = site_id
- if major == 0 and minor >= 3:
- url = "settings"
- else:
- # Backward compatibility for AYON server < 0.3.0
- url = "settings/addons"
- query_values.pop("bundle_name", None)
- for new_key, old_key in (
- ("project_name", "project"),
- ("site_id", "site"),
- ):
- if new_key in query_values:
- query_values[old_key] = query_values.pop(new_key)
-
query = prepare_query_string(query_values)
- response = self.get("{}{}".format(url, query))
+ response = self.get("settings{}".format(query))
response.raise_for_status()
return response.data
@@ -3055,15 +3044,10 @@ class ServerAPI(object):
use_site=use_site
)
if only_values:
- major, minor, patch, _, _ = self.server_version_tuple
- if major == 0 and minor >= 3:
- output = {
- addon["name"]: addon["settings"]
- for addon in output["addons"]
- }
- else:
- # Backward compatibility for AYON server < 0.3.0
- output = output["settings"]
+ output = {
+ addon["name"]: addon["settings"]
+ for addon in output["addons"]
+ }
return output
def get_addons_project_settings(
@@ -3124,15 +3108,10 @@ class ServerAPI(object):
use_site=use_site
)
if only_values:
- major, minor, patch, _, _ = self.server_version_tuple
- if major == 0 and minor >= 3:
- output = {
- addon["name"]: addon["settings"]
- for addon in output["addons"]
- }
- else:
- # Backward compatibility for AYON server < 0.3.0
- output = output["settings"]
+ output = {
+ addon["name"]: addon["settings"]
+ for addon in output["addons"]
+ }
return output
def get_addons_settings(
@@ -3549,8 +3528,14 @@ class ServerAPI(object):
folder_names=None,
folder_types=None,
parent_ids=None,
+ folder_path_regex=None,
+ has_products=None,
+ has_tasks=None,
+ has_children=None,
statuses=None,
+ tags=None,
active=True,
+ has_links=None,
fields=None,
own_attributes=False
):
@@ -3574,10 +3559,22 @@ class ServerAPI(object):
for filtering.
parent_ids (Optional[Iterable[str]]): Ids of folder parents.
Use 'None' if folder is direct child of project.
+ folder_path_regex (Optional[str]): Folder path regex used
+ for filtering.
+ has_products (Optional[bool]): Filter folders with/without
+ products. Ignored when None, default behavior.
+ has_tasks (Optional[bool]): Filter folders with/without
+ tasks. Ignored when None, default behavior.
+ has_children (Optional[bool]): Filter folders with/without
+ children. Ignored when None, default behavior.
statuses (Optional[Iterable[str]]): Folder statuses used
for filtering.
+ tags (Optional[Iterable[str]]): Folder tags used
+ for filtering.
active (Optional[bool]): Filter active/inactive folders.
Both are returned if is set to None.
+ has_links (Optional[Literal[IN, OUT, ANY]]): Filter
+ representations with IN/OUT/ANY links.
fields (Optional[Iterable[str]]): Fields to be queried for
folder. All possible folder fields are returned
if 'None' is passed.
@@ -3624,6 +3621,12 @@ class ServerAPI(object):
return
filters["folderStatuses"] = list(statuses)
+ if tags is not None:
+ tags = set(tags)
+ if not tags:
+ return
+ filters["folderTags"] = list(tags)
+
if parent_ids is not None:
parent_ids = set(parent_ids)
if not parent_ids:
@@ -3644,6 +3647,21 @@ class ServerAPI(object):
filters["parentFolderIds"] = list(parent_ids)
+ if folder_path_regex is not None:
+ filters["folderPathRegex"] = folder_path_regex
+
+ if has_products is not None:
+ filters["folderHasProducts"] = has_products
+
+ if has_tasks is not None:
+ filters["folderHasTasks"] = has_tasks
+
+ if has_links is not None:
+ filters["folderHasLinks"] = has_links.upper()
+
+ if has_children is not None:
+ filters["folderHasChildren"] = has_children
+
if not fields:
fields = self.get_default_fields_for_type("folder")
else:
@@ -3653,7 +3671,7 @@ class ServerAPI(object):
fields |= self.get_attributes_fields_for_type("folder")
use_rest = False
- if "data" in fields:
+ if "data" in fields and not self.graphql_allows_data_in_query:
use_rest = True
fields = {"id"}
@@ -3674,6 +3692,8 @@ class ServerAPI(object):
if use_rest:
folder = self.get_rest_folder(project_name, folder["id"])
+ else:
+ self._convert_entity_data(folder)
if own_attributes:
fill_own_attribs(folder)
@@ -3826,6 +3846,10 @@ class ServerAPI(object):
task_names=None,
task_types=None,
folder_ids=None,
+ assignees=None,
+ assignees_all=None,
+ statuses=None,
+ tags=None,
active=True,
fields=None,
own_attributes=False
@@ -3839,6 +3863,16 @@ class ServerAPI(object):
task_types (Iterable[str]): Task types used for filtering.
folder_ids (Iterable[str]): Ids of task parents. Use 'None'
if folder is direct child of project.
+ assignees (Optional[Iterable[str]]): Task assignees used for
+ filtering. All tasks with any of passed assignees are
+ returned.
+ assignees_all (Optional[Iterable[str]]): Task assignees used
+ for filtering. Task must have all of passed assignees to be
+ returned.
+ statuses (Optional[Iterable[str]]): Task statuses used for
+ filtering.
+ tags (Optional[Iterable[str]]): Task tags used for
+ filtering.
active (Optional[bool]): Filter active/inactive tasks.
Both are returned if is set to None.
fields (Optional[Iterable[str]]): Fields to be queried for
@@ -3882,6 +3916,30 @@ class ServerAPI(object):
return
filters["folderIds"] = list(folder_ids)
+ if assignees is not None:
+ assignees = set(assignees)
+ if not assignees:
+ return
+ filters["taskAssigneesAny"] = list(assignees)
+
+ if assignees_all is not None:
+ assignees_all = set(assignees_all)
+ if not assignees_all:
+ return
+ filters["taskAssigneesAll"] = list(assignees_all)
+
+ if statuses is not None:
+ statuses = set(statuses)
+ if not statuses:
+ return
+ filters["taskStatuses"] = list(statuses)
+
+ if tags is not None:
+ tags = set(tags)
+ if not tags:
+ return
+ filters["taskTags"] = list(tags)
+
if not fields:
fields = self.get_default_fields_for_type("task")
else:
@@ -3891,7 +3949,7 @@ class ServerAPI(object):
fields |= self.get_attributes_fields_for_type("task")
use_rest = False
- if "data" in fields:
+ if "data" in fields and not self.graphql_allows_data_in_query:
use_rest = True
fields = {"id"}
@@ -3912,6 +3970,8 @@ class ServerAPI(object):
if use_rest:
task = self.get_rest_task(project_name, task["id"])
+ else:
+ self._convert_entity_data(task)
if own_attributes:
fill_own_attribs(task)
@@ -3992,6 +4052,8 @@ class ServerAPI(object):
if use_rest:
product = self.get_rest_product(project_name, product["id"])
+ else:
+ self._convert_entity_data(product)
if own_attributes:
fill_own_attribs(product)
@@ -4005,8 +4067,11 @@ class ServerAPI(object):
product_names=None,
folder_ids=None,
product_types=None,
- statuses=None,
+ product_name_regex=None,
+ product_path_regex=None,
names_by_folder_ids=None,
+ statuses=None,
+ tags=None,
active=True,
fields=None,
own_attributes=False
@@ -4026,10 +4091,15 @@ class ServerAPI(object):
Use 'None' if folder is direct child of project.
product_types (Optional[Iterable[str]]): Product types used for
filtering.
- statuses (Optional[Iterable[str]]): Product statuses used for
- filtering.
+ product_name_regex (Optional[str]): Filter products by name regex.
+ product_path_regex (Optional[str]): Filter products by path regex.
+ Path starts with folder path and ends with product name.
names_by_folder_ids (Optional[dict[str, Iterable[str]]]): Product
name filtering by folder id.
+ statuses (Optional[Iterable[str]]): Product statuses used
+ for filtering.
+ tags (Optional[Iterable[str]]): Product tags used
+ for filtering.
active (Optional[bool]): Filter active/inactive products.
Both are returned if is set to None.
fields (Optional[Iterable[str]]): Fields to be queried for
@@ -4045,11 +4115,7 @@ class ServerAPI(object):
if not project_name:
return
- if product_ids is not None:
- product_ids = set(product_ids)
- if not product_ids:
- return
-
+ # Prepare these filters before 'name_by_filter_ids' filter
filter_product_names = None
if product_names is not None:
filter_product_names = set(product_names)
@@ -4062,18 +4128,6 @@ class ServerAPI(object):
if not filter_folder_ids:
return
- filter_product_types = None
- if product_types is not None:
- filter_product_types = set(product_types)
- if not filter_product_types:
- return
-
- filter_statuses = None
- if statuses is not None:
- filter_statuses = set(statuses)
- if not filter_statuses:
- return
-
# This will disable 'folder_ids' and 'product_names' filters
# - maybe could be enhanced in future?
if names_by_folder_ids is not None:
@@ -4098,7 +4152,7 @@ class ServerAPI(object):
fields = self.get_default_fields_for_type("product")
use_rest = False
- if "data" in fields:
+ if "data" in fields and not self.graphql_allows_data_in_query:
use_rest = True
fields = {"id"}
@@ -4117,21 +4171,43 @@ class ServerAPI(object):
filters = {
"projectName": project_name
}
+
if filter_folder_ids:
filters["folderIds"] = list(filter_folder_ids)
- if filter_product_types:
- filters["productTypes"] = list(filter_product_types)
-
- if filter_statuses:
- filters["statuses"] = list(filter_statuses)
-
- if product_ids:
- filters["productIds"] = list(product_ids)
-
if filter_product_names:
filters["productNames"] = list(filter_product_names)
+ if product_ids is not None:
+ product_ids = set(product_ids)
+ if not product_ids:
+ return
+ filters["productIds"] = list(product_ids)
+
+ if product_types is not None:
+ product_types = set(product_types)
+ if not product_types:
+ return
+ filters["productTypes"] = list(product_types)
+
+ if statuses is not None:
+ statuses = set(statuses)
+ if not statuses:
+ return
+ filters["productStatuses"] = list(statuses)
+
+ if tags is not None:
+ tags = set(tags)
+ if not tags:
+ return
+ filters["productTags"] = list(tags)
+
+ if product_name_regex:
+ filters["productNameRegex"] = product_name_regex
+
+ if product_path_regex:
+ filters["productPathRegex"] = product_path_regex
+
query = products_graphql_query(fields)
for attr, filter_value in filters.items():
query.set_variable_value(attr, filter_value)
@@ -4323,6 +4399,8 @@ class ServerAPI(object):
hero=True,
standard=True,
latest=None,
+ statuses=None,
+ tags=None,
active=True,
fields=None,
own_attributes=False
@@ -4342,6 +4420,10 @@ class ServerAPI(object):
latest (Optional[bool]): Return only latest version of standard
versions. This can be combined only with 'standard' attribute
set to True.
+ statuses (Optional[Iterable[str]]): Representation statuses used
+ for filtering.
+ tags (Optional[Iterable[str]]): Representation tags used
+ for filtering.
active (Optional[bool]): Receive active/inactive entities.
Both are returned when 'None' is passed.
fields (Optional[Iterable[str]]): Fields to be queried
@@ -4366,7 +4448,7 @@ class ServerAPI(object):
fields |= {"id", "version"}
use_rest = False
- if "data" in fields:
+ if "data" in fields and not self.graphql_allows_data_in_query:
use_rest = True
fields = {"id"}
@@ -4398,6 +4480,18 @@ class ServerAPI(object):
return
filters["versions"] = list(versions)
+ if statuses is not None:
+ statuses = set(statuses)
+ if not statuses:
+ return
+ filters["versionStatuses"] = list(statuses)
+
+ if tags is not None:
+ tags = set(tags)
+ if not tags:
+ return
+ filters["versionTags"] = list(tags)
+
if not hero and not standard:
return
@@ -4446,6 +4540,8 @@ class ServerAPI(object):
version = self.get_rest_version(
project_name, version["id"]
)
+ else:
+ self._convert_entity_data(version)
if own_attributes:
fill_own_attribs(version)
@@ -4652,6 +4748,10 @@ class ServerAPI(object):
dict[str, dict[str, Any]]: Last versions by product id.
"""
+ if fields:
+ fields = set(fields)
+ fields.add("productId")
+
versions = self.get_versions(
project_name,
product_ids=product_ids,
@@ -4661,7 +4761,7 @@ class ServerAPI(object):
own_attributes=own_attributes
)
return {
- version["parent"]: version
+ version["productId"]: version
for version in versions
}
@@ -4775,6 +4875,23 @@ class ServerAPI(object):
)
return latest_version["id"] == version_id
+ def _representation_conversion(self, representation):
+ if "context" in representation:
+ orig_context = representation["context"]
+ context = {}
+ if orig_context and orig_context != "null":
+ context = json.loads(orig_context)
+ representation["context"] = context
+
+ repre_files = representation.get("files")
+ if not repre_files:
+ return
+
+ for repre_file in repre_files:
+ repre_file_size = repre_file.get("size")
+ if repre_file_size is not None:
+ repre_file["size"] = int(repre_file["size"])
+
def get_representations(
self,
project_name,
@@ -4782,7 +4899,10 @@ class ServerAPI(object):
representation_names=None,
version_ids=None,
names_by_version_ids=None,
+ statuses=None,
+ tags=None,
active=True,
+ has_links=None,
fields=None,
own_attributes=False
):
@@ -4804,8 +4924,14 @@ class ServerAPI(object):
names_by_version_ids (Optional[bool]): Find representations
by names and version ids. This filter discard all
other filters.
+ statuses (Optional[Iterable[str]]): Representation statuses used
+ for filtering.
+ tags (Optional[Iterable[str]]): Representation tags used
+ for filtering.
active (Optional[bool]): Receive active/inactive entities.
Both are returned when 'None' is passed.
+ has_links (Optional[Literal[IN, OUT, ANY]]): Filter
+ representations with IN/OUT/ANY links.
fields (Optional[Iterable[str]]): Fields to be queried for
representation. All possible fields are returned if 'None' is
passed.
@@ -4822,10 +4948,12 @@ class ServerAPI(object):
fields = set(fields)
if "attrib" in fields:
fields.remove("attrib")
- fields |= self.get_attributes_fields_for_type("representation")
+ fields |= self.get_attributes_fields_for_type(
+ "representation"
+ )
use_rest = False
- if "data" in fields:
+ if "data" in fields and not self.graphql_allows_data_in_query:
use_rest = True
fields = {"id"}
@@ -4874,6 +5002,21 @@ class ServerAPI(object):
if representaion_names_filter:
filters["representationNames"] = list(representaion_names_filter)
+ if statuses is not None:
+ statuses = set(statuses)
+ if not statuses:
+ return
+ filters["representationStatuses"] = list(statuses)
+
+ if tags is not None:
+ tags = set(tags)
+ if not tags:
+ return
+ filters["representationTags"] = list(tags)
+
+ if has_links is not None:
+ filters["representationHasLinks"] = has_links.upper()
+
query = representations_graphql_query(fields)
for attr, filter_value in filters.items():
@@ -4888,13 +5031,10 @@ class ServerAPI(object):
repre = self.get_rest_representation(
project_name, repre["id"]
)
+ else:
+ self._convert_entity_data(repre)
- if "context" in repre:
- orig_context = repre["context"]
- context = {}
- if orig_context and orig_context != "null":
- context = json.loads(orig_context)
- repre["context"] = context
+ self._representation_conversion(repre)
if own_attributes:
fill_own_attribs(repre)
@@ -5007,6 +5147,9 @@ class ServerAPI(object):
version = repre.pop("version")
product = version.pop("product")
folder = product.pop("folder")
+ self._convert_entity_data(version)
+ self._convert_entity_data(product)
+ self._convert_entity_data(folder)
output[repre_id] = RepresentationParents(
version, product, folder, project
)
@@ -5128,6 +5271,10 @@ class ServerAPI(object):
workfile_ids=None,
task_ids=None,
paths=None,
+ path_regex=None,
+ statuses=None,
+ tags=None,
+ has_links=None,
fields=None,
own_attributes=False
):
@@ -5138,6 +5285,13 @@ class ServerAPI(object):
workfile_ids (Optional[Iterable[str]]): Workfile ids.
task_ids (Optional[Iterable[str]]): Task ids.
paths (Optional[Iterable[str]]): Rootless workfiles paths.
+ path_regex (Optional[str]): Regex filter for workfile path.
+ statuses (Optional[Iterable[str]]): Workfile info statuses used
+ for filtering.
+ tags (Optional[Iterable[str]]): Workfile info tags used
+ for filtering.
+ has_links (Optional[Literal[IN, OUT, ANY]]): Filter
+ representations with IN/OUT/ANY links.
fields (Optional[Iterable[str]]): Fields to be queried for
representation. All possible fields are returned if 'None' is
passed.
@@ -5161,12 +5315,30 @@ class ServerAPI(object):
return
filters["paths"] = list(paths)
+ if path_regex is not None:
+ filters["workfilePathRegex"] = path_regex
+
if workfile_ids is not None:
workfile_ids = set(workfile_ids)
if not workfile_ids:
return
filters["workfileIds"] = list(workfile_ids)
+ if statuses is not None:
+ statuses = set(statuses)
+ if not statuses:
+ return
+ filters["workfileStatuses"] = list(statuses)
+
+ if tags is not None:
+ tags = set(tags)
+ if not tags:
+ return
+ filters["workfileTags"] = list(tags)
+
+ if has_links is not None:
+ filters["workfilehasLinks"] = has_links.upper()
+
if not fields:
fields = self.get_default_fields_for_type("workfile")
@@ -5459,16 +5631,14 @@ class ServerAPI(object):
return thumbnail_id
mime_type = self._get_thumbnail_mime_type(src_filepath)
- with open(src_filepath, "rb") as stream:
- content = stream.read()
-
- response = self.raw_post(
+ response = self.upload_file(
"projects/{}/thumbnails".format(project_name),
+ src_filepath,
+ request_type=RequestTypes.post,
headers={"Content-Type": mime_type},
- data=content
)
response.raise_for_status()
- return response.data["id"]
+ return response.json()["id"]
def update_thumbnail(self, project_name, thumbnail_id, src_filepath):
"""Change thumbnail content by id.
@@ -5489,13 +5659,11 @@ class ServerAPI(object):
raise ValueError("Entered filepath does not exist.")
mime_type = self._get_thumbnail_mime_type(src_filepath)
- with open(src_filepath, "rb") as stream:
- content = stream.read()
-
- response = self.raw_put(
+ response = self.upload_file(
"projects/{}/thumbnails/{}".format(project_name, thumbnail_id),
+ src_filepath,
+ request_type=RequestTypes.put,
headers={"Content-Type": mime_type},
- data=content
)
response.raise_for_status()
@@ -6317,3 +6485,13 @@ class ServerAPI(object):
op_result["detail"],
))
return op_results
+
+ def _convert_entity_data(self, entity):
+ if not entity:
+ return
+ entity_data = entity.get("data")
+ if (
+ entity_data is not None
+ and isinstance(entity_data, six.string_types)
+ ):
+ entity["data"] = json.loads(entity_data)
diff --git a/openpype/vendor/python/common/ayon_api/utils.py b/openpype/vendor/python/common/ayon_api/utils.py
index 502d24f713..e9d7f53771 100644
--- a/openpype/vendor/python/common/ayon_api/utils.py
+++ b/openpype/vendor/python/common/ayon_api/utils.py
@@ -16,7 +16,11 @@ except ImportError:
import requests
import unidecode
-from .constants import SERVER_TIMEOUT_ENV_KEY
+from .constants import (
+ SERVER_TIMEOUT_ENV_KEY,
+ DEFAULT_VARIANT_ENV_KEY,
+ SITE_ID_ENV_KEY,
+)
from .exceptions import UrlError
REMOVED_VALUE = object()
@@ -46,6 +50,26 @@ def get_default_timeout():
return 10.0
+def get_default_settings_variant():
+ """Default settings variant.
+
+ Returns:
+ str: Settings variant from environment variable or 'production'.
+ """
+
+ return os.environ.get(DEFAULT_VARIANT_ENV_KEY) or "production"
+
+
+def get_default_site_id():
+ """Site id used for server connection.
+
+ Returns:
+ Union[str, None]: Site id from environment variable or None.
+ """
+
+ return os.environ.get(SITE_ID_ENV_KEY)
+
+
class ThumbnailContent:
"""Wrapper for thumbnail content.
diff --git a/openpype/vendor/python/common/ayon_api/version.py b/openpype/vendor/python/common/ayon_api/version.py
index ac4f32997f..ce0173a248 100644
--- a/openpype/vendor/python/common/ayon_api/version.py
+++ b/openpype/vendor/python/common/ayon_api/version.py
@@ -1,2 +1,2 @@
"""Package declaring Python API for Ayon server."""
-__version__ = "0.5.1"
+__version__ = "1.0.0-rc.3"
diff --git a/openpype/version.py b/openpype/version.py
index a54f88871a..c4ff4dde95 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
"""Package declaring Pype version."""
-__version__ = "3.17.7-nightly.3"
+__version__ = "3.18.2-nightly.2"
diff --git a/pyproject.toml b/pyproject.toml
index 21ba7d1199..e64018498f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "OpenPype"
-version = "3.17.6" # OpenPype
+version = "3.18.1" # OpenPype
description = "Open VFX and Animation pipeline with support."
authors = ["OpenPype Team "]
license = "MIT License"
diff --git a/server_addon/applications/server/applications.json b/server_addon/applications/server/applications.json
index f846b04215..35f1b4cfbb 100644
--- a/server_addon/applications/server/applications.json
+++ b/server_addon/applications/server/applications.json
@@ -14,7 +14,7 @@
"windows": [
"C:\\Program Files\\Autodesk\\Maya2024\\bin\\maya.exe"
],
- "darwin": [],
+ "darwin": ["/Applications/Autodesk/maya2024/Maya.app"],
"linux": [
"/usr/autodesk/maya2024/bin/maya"
]
@@ -34,7 +34,7 @@
"windows": [
"C:\\Program Files\\Autodesk\\Maya2023\\bin\\maya.exe"
],
- "darwin": [],
+ "darwin": ["/Applications/Autodesk/maya2023/Maya.app"],
"linux": [
"/usr/autodesk/maya2023/bin/maya"
]
@@ -54,7 +54,7 @@
"windows": [
"C:\\Program Files\\Autodesk\\Maya2022\\bin\\maya.exe"
],
- "darwin": [],
+ "darwin": ["/Applications/Autodesk/maya2022/Maya.app"],
"linux": [
"/usr/autodesk/maya2022/bin/maya"
]
@@ -125,6 +125,23 @@
"host_name": "max",
"environment": "{\n \"ADSK_3DSMAX_STARTUPSCRIPTS_ADDON_DIR\": \"{OPENPYPE_ROOT}/openpype/hosts/max/startup\"\n}",
"variants": [
+ {
+ "name": "2024",
+ "use_python_2": false,
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Autodesk\\3ds Max 2024\\3dsmax.exe"
+ ],
+ "darwin": [],
+ "linux": []
+ },
+ "arguments": {
+ "windows": [],
+ "darwin": [],
+ "linux": []
+ },
+ "environment": "{\n \"3DSMAX_VERSION\": \"2024\"\n}"
+ },
{
"name": "2023",
"use_python_2": false,
@@ -200,18 +217,40 @@
"host_name": "nuke",
"environment": "{\n \"NUKE_PATH\": [\n \"{NUKE_PATH}\",\n \"{OPENPYPE_STUDIO_PLUGINS}/nuke\"\n ]\n}",
"variants": [
+ {
+ "name": "15-0",
+ "label": "15.0",
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe"
+ ],
+ "darwin": [
+ "/Applications/Nuke15.0v2/Nuke15.0v2.app"
+ ],
+ "linux": [
+ "/usr/local/Nuke5.0v2/Nuke15.0"
+ ]
+ },
+ "arguments": {
+ "windows": [],
+ "darwin": [],
+ "linux": []
+ },
+ "environment": "{}",
+ "use_python_2": false
+ },
{
"name": "14-0",
"label": "14.0",
"executables": {
"windows": [
- "C:\\Program Files\\Nuke14.0v4\\Nuke14.0.exe"
+ "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe"
],
"darwin": [
- "/Applications/Nuke14.0v4/Nuke14.0v4.app"
+ "/Applications/Nuke14.0v5/Nuke14.0v5.app"
],
"linux": [
- "/usr/local/Nuke14.0v4/Nuke14.0"
+ "/usr/local/Nuke14.0v5/Nuke14.0"
]
},
"arguments": {
@@ -243,28 +282,6 @@
},
"environment": "{}",
"use_python_2": false
- },
- {
- "name": "13-0",
- "label": "13.0",
- "use_python_2": false,
- "executables": {
- "windows": [
- "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe"
- ],
- "darwin": [
- "/Applications/Nuke13.0v1/Nuke13.0v1.app"
- ],
- "linux": [
- "/usr/local/Nuke13.0v1/Nuke13.0"
- ]
- },
- "arguments": {
- "windows": [],
- "darwin": [],
- "linux": []
- },
- "environment": "{}"
}
]
},
@@ -275,28 +292,46 @@
"host_name": "nuke",
"environment": "{\n \"NUKE_PATH\": [\n \"{NUKE_PATH}\",\n \"{OPENPYPE_STUDIO_PLUGINS}/nuke\"\n ]\n}",
"variants": [
+ {
+ "name": "15-0",
+ "label": "15.0",
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe"
+ ],
+ "darwin": [
+ "/Applications/Nuke15.0v2/NukeAssist15.0v2.app"
+ ],
+ "linux": [
+ "/usr/local/Nuke5.0v2/Nuke15.0"
+ ]
+ },
+ "arguments": {
+ "windows": [],
+ "darwin": [],
+ "linux": []
+ },
+ "environment": "{}",
+ "use_python_2": false
+ },
{
"name": "14-0",
"label": "14.0",
"executables": {
"windows": [
- "C:\\Program Files\\Nuke14.0v4\\Nuke14.0.exe"
+ "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe"
],
"darwin": [
- "/Applications/Nuke14.0v4/NukeAssist14.0v4.app"
+ "/Applications/Nuke14.0v5/NukeAssist14.0v5.app"
],
"linux": [
- "/usr/local/Nuke14.0v4/Nuke14.0"
+ "/usr/local/Nuke14.0v5/Nuke14.0"
]
},
"arguments": {
- "windows": [
- "--nukeassist"
- ],
+ "windows": [],
"darwin": [],
- "linux": [
- "--nukeassist"
- ]
+ "linux": []
},
"environment": "{}",
"use_python_2": false
@@ -316,42 +351,12 @@
]
},
"arguments": {
- "windows": [
- "--nukeassist"
- ],
+ "windows": [],
"darwin": [],
- "linux": [
- "--nukeassist"
- ]
+ "linux": []
},
"environment": "{}",
"use_python_2": false
- },
- {
- "name": "13-0",
- "label": "13.0",
- "use_python_2": false,
- "executables": {
- "windows": [
- "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe"
- ],
- "darwin": [
- "/Applications/Nuke13.0v1/NukeAssist13.0v1.app"
- ],
- "linux": [
- "/usr/local/Nuke13.0v1/Nuke13.0"
- ]
- },
- "arguments": {
- "windows": [
- "--nukeassist"
- ],
- "darwin": [],
- "linux": [
- "--nukeassist"
- ]
- },
- "environment": "{}"
}
]
},
@@ -362,28 +367,46 @@
"host_name": "nuke",
"environment": "{\n \"NUKE_PATH\": [\n \"{NUKE_PATH}\",\n \"{OPENPYPE_STUDIO_PLUGINS}/nuke\"\n ]\n}",
"variants": [
+ {
+ "name": "15-0",
+ "label": "15.0",
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe"
+ ],
+ "darwin": [
+ "/Applications/Nuke15.0v2/NukeX15.0v2.app"
+ ],
+ "linux": [
+ "/usr/local/Nuke5.0v2/Nuke15.0"
+ ]
+ },
+ "arguments": {
+ "windows": [],
+ "darwin": [],
+ "linux": []
+ },
+ "environment": "{}",
+ "use_python_2": false
+ },
{
"name": "14-0",
"label": "14.0",
"executables": {
"windows": [
- "C:\\Program Files\\Nuke14.0v4\\Nuke14.0.exe"
+ "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe"
],
"darwin": [
- "/Applications/Nuke14.0v4/NukeX14.0v4.app"
+ "/Applications/Nuke14.0v5/NukeX14.0v5.app"
],
"linux": [
- "/usr/local/Nuke14.0v4/Nuke14.0"
+ "/usr/local/Nuke14.0v5/Nuke14.0"
]
},
"arguments": {
- "windows": [
- "--nukex"
- ],
+ "windows": [],
"darwin": [],
- "linux": [
- "--nukex"
- ]
+ "linux": []
},
"environment": "{}",
"use_python_2": false
@@ -403,42 +426,12 @@
]
},
"arguments": {
- "windows": [
- "--nukex"
- ],
+ "windows": [],
"darwin": [],
- "linux": [
- "--nukex"
- ]
+ "linux": []
},
"environment": "{}",
"use_python_2": false
- },
- {
- "name": "13-0",
- "label": "13.0",
- "use_python_2": false,
- "executables": {
- "windows": [
- "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe"
- ],
- "darwin": [
- "/Applications/Nuke13.0v1/NukeX13.0v1.app"
- ],
- "linux": [
- "/usr/local/Nuke13.0v1/Nuke13.0"
- ]
- },
- "arguments": {
- "windows": [
- "--nukex"
- ],
- "darwin": [],
- "linux": [
- "--nukex"
- ]
- },
- "environment": "{}"
}
]
},
@@ -449,28 +442,46 @@
"host_name": "hiero",
"environment": "{\n \"WORKFILES_STARTUP\": \"0\",\n \"TAG_ASSETBUILD_STARTUP\": \"0\"\n}",
"variants": [
+ {
+ "name": "15-0",
+ "label": "15.0",
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe"
+ ],
+ "darwin": [
+ "/Applications/Nuke15.0v2/NukeStudio15.0v2.app"
+ ],
+ "linux": [
+ "/usr/local/Nuke5.0v2/Nuke15.0"
+ ]
+ },
+ "arguments": {
+ "windows": [],
+ "darwin": [],
+ "linux": []
+ },
+ "environment": "{}",
+ "use_python_2": false
+ },
{
"name": "14-0",
"label": "14.0",
"executables": {
"windows": [
- "C:\\Program Files\\Nuke14.0v4\\Nuke14.0.exe"
+ "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe"
],
"darwin": [
- "/Applications/Nuke14.0v4/NukeStudio14.0v4.app"
+ "/Applications/Nuke14.0v5/NukeStudio14.0v5.app"
],
"linux": [
- "/usr/local/Nuke14.0v4/Nuke14.0"
+ "/usr/local/Nuke14.0v5/Nuke14.0"
]
},
"arguments": {
- "windows": [
- "--studio"
- ],
+ "windows": [],
"darwin": [],
- "linux": [
- "--studio"
- ]
+ "linux": []
},
"environment": "{}",
"use_python_2": false
@@ -490,42 +501,12 @@
]
},
"arguments": {
- "windows": [
- "--studio"
- ],
+ "windows": [],
"darwin": [],
- "linux": [
- "--studio"
- ]
+ "linux": []
},
"environment": "{}",
"use_python_2": false
- },
- {
- "name": "13-0",
- "label": "13.0",
- "use_python_2": false,
- "executables": {
- "windows": [
- "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe"
- ],
- "darwin": [
- "/Applications/Nuke13.0v1/NukeStudio13.0v1.app"
- ],
- "linux": [
- "/usr/local/Nuke13.0v1/Nuke13.0"
- ]
- },
- "arguments": {
- "windows": [
- "--studio"
- ],
- "darwin": [],
- "linux": [
- "--studio"
- ]
- },
- "environment": "{}"
}
]
},
@@ -536,28 +517,46 @@
"host_name": "hiero",
"environment": "{\n \"WORKFILES_STARTUP\": \"0\",\n \"TAG_ASSETBUILD_STARTUP\": \"0\"\n}",
"variants": [
+ {
+ "name": "15-0",
+ "label": "15.0",
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe"
+ ],
+ "darwin": [
+ "/Applications/Nuke15.0v2/Hiero15.0v2.app"
+ ],
+ "linux": [
+ "/usr/local/Nuke5.0v2/Nuke15.0"
+ ]
+ },
+ "arguments": {
+ "windows": [],
+ "darwin": [],
+ "linux": []
+ },
+ "environment": "{}",
+ "use_python_2": false
+ },
{
"name": "14-0",
"label": "14.0",
"executables": {
"windows": [
- "C:\\Program Files\\Nuke14.0v4\\Nuke14.0.exe"
+ "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe"
],
"darwin": [
- "/Applications/Nuke14.0v4/Hiero14.0v4.app"
+ "/Applications/Nuke14.0v5/Hiero14.0v5.app"
],
"linux": [
- "/usr/local/Nuke14.0v4/Nuke14.0"
+ "/usr/local/Nuke14.0v5/Nuke14.0"
]
},
"arguments": {
- "windows": [
- "--hiero"
- ],
+ "windows": [],
"darwin": [],
- "linux": [
- "--hiero"
- ]
+ "linux": []
},
"environment": "{}",
"use_python_2": false
@@ -577,42 +576,12 @@
]
},
"arguments": {
- "windows": [
- "--hiero"
- ],
+ "windows": [],
"darwin": [],
- "linux": [
- "--hiero"
- ]
+ "linux": []
},
"environment": "{}",
"use_python_2": false
- },
- {
- "name": "13-0",
- "label": "13.0",
- "use_python_2": false,
- "executables": {
- "windows": [
- "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe"
- ],
- "darwin": [
- "/Applications/Nuke13.0v1/Hiero13.0v1.app"
- ],
- "linux": [
- "/usr/local/Nuke13.0v1/Nuke13.0"
- ]
- },
- "arguments": {
- "windows": [
- "--hiero"
- ],
- "darwin": [],
- "linux": [
- "--hiero"
- ]
- },
- "environment": "{}"
}
]
},
@@ -623,6 +592,23 @@
"host_name": "fusion",
"environment": "{\n \"FUSION_PYTHON3_HOME\": {\n \"windows\": \"{LOCALAPPDATA}/Programs/Python/Python36\",\n \"darwin\": \"~/Library/Python/3.6/bin\",\n \"linux\": \"/opt/Python/3.6/bin\"\n }\n}",
"variants": [
+ {
+ "name": "18",
+ "label": "18",
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Blackmagic Design\\Fusion 18\\Fusion.exe"
+ ],
+ "darwin": [],
+ "linux": []
+ },
+ "arguments": {
+ "windows": [],
+ "darwin": [],
+ "linux": []
+ },
+ "environment": "{}"
+ },
{
"name": "17",
"label": "17",
@@ -656,23 +642,6 @@
"linux": []
},
"environment": "{}"
- },
- {
- "name": "9",
- "label": "9",
- "executables": {
- "windows": [
- "C:\\Program Files\\Blackmagic Design\\Fusion 9\\Fusion.exe"
- ],
- "darwin": [],
- "linux": []
- },
- "arguments": {
- "windows": [],
- "darwin": [],
- "linux": []
- },
- "environment": "{}"
}
]
},
@@ -710,11 +679,11 @@
"environment": "{}",
"variants": [
{
- "name": "18-5",
- "label": "18.5",
+ "name": "19-5",
+ "label": "19.5",
"executables": {
"windows": [
- "C:\\Program Files\\Side Effects Software\\Houdini 18.5.499\\bin\\houdini.exe"
+ "C:\\Program Files\\Side Effects Software\\Houdini 19.5.805\\bin\\houdini.exe"
],
"darwin": [],
"linux": []
@@ -728,10 +697,12 @@
"use_python_2": true
},
{
- "name": "18",
- "label": "18",
+ "name": "19-0",
+ "label": "19.0",
"executables": {
- "windows": [],
+ "windows": [
+ "C:\\Program Files\\Side Effects Software\\Houdini 19.0.720\\bin\\houdini.exe"
+ ],
"darwin": [],
"linux": []
},
@@ -744,10 +715,12 @@
"use_python_2": true
},
{
- "name": "17",
- "label": "17",
+ "name": "18-5",
+ "label": "18.5",
"executables": {
- "windows": [],
+ "windows": [
+ "C:\\Program Files\\Side Effects Software\\Houdini 18.5.759\\bin\\houdini.exe"
+ ],
"darwin": [],
"linux": []
},
@@ -769,11 +742,11 @@
"environment": "{}",
"variants": [
{
- "name": "2-83",
- "label": "2.83",
+ "name": "3-6-5",
+ "label": "3.6.5 LTS",
"executables": {
"windows": [
- "C:\\Program Files\\Blender Foundation\\Blender 2.83\\blender.exe"
+ "C:\\Program Files\\Blender Foundation\\Blender 3.6\\blender.exe"
],
"darwin": [],
"linux": []
@@ -846,6 +819,25 @@
"host_name": "harmony",
"environment": "{\n \"AVALON_HARMONY_WORKFILES_ON_LAUNCH\": \"1\"\n}",
"variants": [
+ {
+ "name": "22",
+ "label": "22",
+ "executables": {
+ "windows": [
+ "c:\\Program Files (x86)\\Toon Boom Animation\\Toon Boom Harmony 22 Premium\\win64\\bin\\HarmonyPremium.exe"
+ ],
+ "darwin": [
+ "/Applications/Toon Boom Harmony 22 Premium/Harmony Premium.app/Contents/MacOS/Harmony Premium"
+ ],
+ "linux": []
+ },
+ "arguments": {
+ "windows": [],
+ "darwin": [],
+ "linux": []
+ },
+ "environment": "{}"
+ },
{
"name": "21",
"label": "21",
@@ -955,40 +947,6 @@
"host_name": "photoshop",
"environment": "{\n \"AVALON_PHOTOSHOP_WORKFILES_ON_LAUNCH\": \"1\",\n \"WORKFILES_SAVE_AS\": \"Yes\"\n}",
"variants": [
- {
- "name": "2020",
- "label": "2020",
- "executables": {
- "windows": [
- "C:\\Program Files\\Adobe\\Adobe Photoshop 2020\\Photoshop.exe"
- ],
- "darwin": [],
- "linux": []
- },
- "arguments": {
- "windows": [],
- "darwin": [],
- "linux": []
- },
- "environment": "{}"
- },
- {
- "name": "2021",
- "label": "2021",
- "executables": {
- "windows": [
- "C:\\Program Files\\Adobe\\Adobe Photoshop 2021\\Photoshop.exe"
- ],
- "darwin": [],
- "linux": []
- },
- "arguments": {
- "windows": [],
- "darwin": [],
- "linux": []
- },
- "environment": "{}"
- },
{
"name": "2022",
"label": "2022",
@@ -1005,6 +963,40 @@
"linux": []
},
"environment": "{}"
+ },
+ {
+ "name": "2023",
+ "label": "2023",
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Adobe\\Adobe Photoshop 2023\\Photoshop.exe"
+ ],
+ "darwin": [],
+ "linux": []
+ },
+ "arguments": {
+ "windows": [],
+ "darwin": [],
+ "linux": []
+ },
+ "environment": "{}"
+ },
+ {
+ "name": "2024",
+ "label": "2024",
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Adobe\\Adobe Photoshop 2024\\Photoshop.exe"
+ ],
+ "darwin": [],
+ "linux": []
+ },
+ "arguments": {
+ "windows": [],
+ "darwin": [],
+ "linux": []
+ },
+ "environment": "{}"
}
]
},
@@ -1015,23 +1007,6 @@
"host_name": "aftereffects",
"environment": "{\n \"AVALON_AFTEREFFECTS_WORKFILES_ON_LAUNCH\": \"1\",\n \"WORKFILES_SAVE_AS\": \"Yes\"\n}",
"variants": [
- {
- "name": "2020",
- "label": "2020",
- "executables": {
- "windows": [
- "C:\\Program Files\\Adobe\\Adobe After Effects 2020\\Support Files\\AfterFX.exe"
- ],
- "darwin": [],
- "linux": []
- },
- "arguments": {
- "windows": [],
- "darwin": [],
- "linux": []
- },
- "environment": "{}"
- },
{
"name": "2021",
"label": "2021",
@@ -1065,6 +1040,40 @@
"linux": []
},
"environment": "{\n \"MULTIPROCESS\": \"No\"\n}"
+ },
+ {
+ "name": "2023",
+ "label": "2023",
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Adobe\\Adobe After Effects 2023\\Support Files\\AfterFX.exe"
+ ],
+ "darwin": [],
+ "linux": []
+ },
+ "arguments": {
+ "windows": [],
+ "darwin": [],
+ "linux": []
+ },
+ "environment": "{\n \"MULTIPROCESS\": \"No\"\n}"
+ },
+ {
+ "name": "2024",
+ "label": "2024",
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Adobe\\Adobe After Effects 2024\\Support Files\\AfterFX.exe"
+ ],
+ "darwin": [],
+ "linux": []
+ },
+ "arguments": {
+ "windows": [],
+ "darwin": [],
+ "linux": []
+ },
+ "environment": "{\n \"MULTIPROCESS\": \"No\"\n}"
}
]
},
@@ -1100,8 +1109,8 @@
"environment": "{}",
"variants": [
{
- "name": "8-2-0",
- "label": "8.2",
+ "name": "stable",
+ "label": "Stable",
"executables": {
"windows": [
"C:\\Program Files\\Adobe\\Adobe Substance 3D Painter\\Adobe Substance 3D Painter.exe"
@@ -1119,16 +1128,48 @@
]
},
"unreal": {
- "enabled": true,
+ "enabled": false,
"label": "Unreal Editor",
"icon": "{}/app_icons/ue4.png",
"host_name": "unreal",
"environment": "{}",
"variants": [
{
- "name": "4-26",
- "label": "4.26",
- "executables": {},
+ "name": "5-0",
+ "label": "5.0",
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Epic Games\\UE_5.0\\Engine\\Binaries\\Win64\\UnrealEditor.exe"
+ ],
+ "darwin": [],
+ "linux": []
+ },
+ "arguments": {},
+ "environment": "{}"
+ },
+ {
+ "name": "5-1",
+ "label": "5.1",
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Epic Games\\UE_5.1\\Engine\\Binaries\\Win64\\UnrealEditor.exe"
+ ],
+ "darwin": [],
+ "linux": []
+ },
+ "arguments": {},
+ "environment": "{}"
+ },
+ {
+ "name": "5-2",
+ "label": "5.2",
+ "executables": {
+ "windows": [
+ "C:\\Program Files\\Epic Games\\UE_5.2\\Engine\\Binaries\\Win64\\UnrealEditor.exe"
+ ],
+ "darwin": [],
+ "linux": []
+ },
"arguments": {},
"environment": "{}"
}
@@ -1158,6 +1199,32 @@
}
]
},
+ "wrap": {
+ "enabled": true,
+ "label": "Wrap",
+ "icon": "{}/app_icons/wrap.png",
+ "host_name": "wrap",
+ "environment": "{\n \n}",
+ "variants": [
+ {
+ "name": "2023",
+ "use_python_2": false,
+ "executables": {
+ "windows": [
+ "c:\\Program Files\\Faceform\\Wrap 2023.10.2\\Wrap.exe"
+ ],
+ "darwin": [],
+ "linux": []
+ },
+ "arguments": {
+ "windows": [],
+ "darwin": [],
+ "linux": []
+ },
+ "environment": "{\n \n}"
+ }
+ ]
+ },
"additional_apps": []
}
}
diff --git a/server_addon/applications/server/settings.py b/server_addon/applications/server/settings.py
index 981d56c30f..70c8b57c6a 100644
--- a/server_addon/applications/server/settings.py
+++ b/server_addon/applications/server/settings.py
@@ -168,6 +168,8 @@ class ApplicationsSettings(BaseSettingsModel):
default_factory=AppGroupWithPython, title="Substance Painter")
unreal: AppGroup = Field(
default_factory=AppGroupWithPython, title="Unreal Editor")
+ wrap: AppGroup = Field(
+ default_factory=AppGroupWithPython, title="Wrap")
additional_apps: list[AdditionalAppGroup] = Field(
default_factory=list, title="Additional Applications")
@@ -197,5 +199,5 @@ class ApplicationsAddonSettings(BaseSettingsModel):
DEFAULT_VALUES = {
- "only_available": False
+ "only_available": True
}
diff --git a/server_addon/blender/server/settings/main.py b/server_addon/blender/server/settings/main.py
index 5eff276ef5..3d53162e45 100644
--- a/server_addon/blender/server/settings/main.py
+++ b/server_addon/blender/server/settings/main.py
@@ -57,7 +57,7 @@ DEFAULT_VALUES = {
"unit_scale_settings": {
"enabled": True,
"apply_on_opening": False,
- "base_file_unit_scale": 0.01
+ "base_file_unit_scale": 1.00
},
"set_frames_startup": True,
"set_resolution_startup": True,
diff --git a/server_addon/blender/server/settings/publish_plugins.py b/server_addon/blender/server/settings/publish_plugins.py
index 1c4ad0c6fd..9a1e0c681e 100644
--- a/server_addon/blender/server/settings/publish_plugins.py
+++ b/server_addon/blender/server/settings/publish_plugins.py
@@ -128,7 +128,7 @@ class PublishPuginsModel(BaseSettingsModel):
)
ExtractLayout: ValidatePluginModel = Field(
default_factory=ValidatePluginModel,
- title="Extract Layout"
+ title="Extract Layout (JSON)"
)
ExtractThumbnail: ExtractPlayblastModel = Field(
default_factory=ExtractPlayblastModel,
@@ -142,7 +142,7 @@ class PublishPuginsModel(BaseSettingsModel):
DEFAULT_BLENDER_PUBLISH_SETTINGS = {
"ValidateCameraZeroKeyframe": {
- "enabled": True,
+ "enabled": False,
"optional": True,
"active": True
},
@@ -173,13 +173,13 @@ DEFAULT_BLENDER_PUBLISH_SETTINGS = {
"active": True
},
"ValidateTransformZero": {
- "enabled": True,
- "optional": False,
+ "enabled": False,
+ "optional": True,
"active": True
},
"ValidateNoColonsInName": {
- "enabled": True,
- "optional": False,
+ "enabled": False,
+ "optional": True,
"active": True
},
"ValidateInstanceEmpty": {
@@ -201,9 +201,9 @@ DEFAULT_BLENDER_PUBLISH_SETTINGS = {
]
},
"ExtractFBX": {
- "enabled": True,
+ "enabled": False,
"optional": True,
- "active": False
+ "active": True
},
"ExtractModelABC": {
"enabled": True,
@@ -216,9 +216,9 @@ DEFAULT_BLENDER_PUBLISH_SETTINGS = {
"active": True
},
"ExtractAnimationFBX": {
- "enabled": True,
+ "enabled": False,
"optional": True,
- "active": False
+ "active": True
},
"ExtractCamera": {
"enabled": True,
diff --git a/server_addon/core/server/settings/main.py b/server_addon/core/server/settings/main.py
index 433d0ef2f0..f9e572cbf9 100644
--- a/server_addon/core/server/settings/main.py
+++ b/server_addon/core/server/settings/main.py
@@ -198,7 +198,7 @@ DEFAULT_VALUES = {
},
"studio_name": "",
"studio_code": "",
- "environments": "{}",
+ "environments": "{\n\"STUDIO_SW\": {\n \"darwin\": \"/mnt/REPO_SW\",\n \"linux\": \"/mnt/REPO_SW\",\n \"windows\": \"P:/REPO_SW\"\n }\n}",
"tools": DEFAULT_TOOLS_VALUES,
"version_start_category": {
"profiles": []
diff --git a/server_addon/core/server/settings/publish_plugins.py b/server_addon/core/server/settings/publish_plugins.py
index 93d8db964d..ef52416369 100644
--- a/server_addon/core/server/settings/publish_plugins.py
+++ b/server_addon/core/server/settings/publish_plugins.py
@@ -84,7 +84,6 @@ class ValidateIntentModel(BaseSettingsModel):
class ExtractThumbnailFFmpegModel(BaseSettingsModel):
- _layout = "expanded"
input: list[str] = Field(
default_factory=list,
title="FFmpeg input arguments"
@@ -95,9 +94,109 @@ class ExtractThumbnailFFmpegModel(BaseSettingsModel):
)
+class ResizeItemModel(BaseSettingsModel):
+ _layout = "expanded"
+ width: int = Field(
+ 1920,
+ ge=0,
+ le=100000,
+ title="Width",
+ description="Width and Height must be both set to higher value than 0"
+ " else source resolution is used."
+ )
+ height: int = Field(
+ 1080,
+ title="Height",
+ ge=0,
+ le=100000,
+ )
+
+
+_resize_types_enum = [
+ {"value": "source", "label": "Image source"},
+ {"value": "resize", "label": "Resize"},
+]
+
+
+class ResizeModel(BaseSettingsModel):
+ _layout = "expanded"
+
+ type: str = Field(
+ title="Type",
+ description="Type of resizing",
+ enum_resolver=lambda: _resize_types_enum,
+ conditionalEnum=True,
+ default="source"
+ )
+
+ resize: ResizeItemModel = Field(
+ default_factory=ResizeItemModel,
+ title="Resize"
+ )
+
+
+_thumbnail_oiio_transcoding_type = [
+ {"value": "colorspace", "label": "Use Colorspace"},
+ {"value": "display_and_view", "label": "Use Display&View"}
+]
+
+
+class DisplayAndViewModel(BaseSettingsModel):
+ _layout = "expanded"
+ display: str = Field(
+ "default",
+ title="Display"
+ )
+ view: str = Field(
+ "sRGB",
+ title="View"
+ )
+
+
+class ExtractThumbnailOIIODefaultsModel(BaseSettingsModel):
+ type: str = Field(
+ title="Type",
+ description="Transcoding type",
+ enum_resolver=lambda: _thumbnail_oiio_transcoding_type,
+ conditionalEnum=True,
+ default="colorspace"
+ )
+
+ colorspace: str = Field(
+ "",
+ title="Colorspace"
+ )
+ display_and_view: DisplayAndViewModel = Field(
+ default_factory=DisplayAndViewModel,
+ title="Display&View"
+ )
+
+
class ExtractThumbnailModel(BaseSettingsModel):
_isGroup = True
enabled: bool = Field(True)
+ integrate_thumbnail: bool = Field(
+ True,
+ title="Integrate Thumbnail Representation"
+ )
+ target_size: ResizeModel = Field(
+ default_factory=ResizeModel,
+ title="Target size"
+ )
+ background_color: ColorRGBA_uint8 = Field(
+ (0, 0, 0, 0.0),
+ title="Background color"
+ )
+ duration_split: float = Field(
+ 0.5,
+ title="Duration split",
+ ge=0.0,
+ le=1.0
+ )
+ oiiotool_defaults: ExtractThumbnailOIIODefaultsModel = Field(
+ default_factory=ExtractThumbnailOIIODefaultsModel,
+ title="OIIOtool defaults"
+ )
ffmpeg_args: ExtractThumbnailFFmpegModel = Field(
default_factory=ExtractThumbnailFFmpegModel
)
@@ -741,6 +840,15 @@ DEFAULT_PUBLISH_VALUES = {
},
"ExtractThumbnail": {
"enabled": True,
+ "integrate_thumbnail": True,
+ "target_size": {
+ "type": "source"
+ },
+ "duration_split": 0.5,
+ "oiiotool_defaults": {
+ "type": "colorspace",
+ "colorspace": "color_picking"
+ },
"ffmpeg_args": {
"input": [
"-apply_trc gamma22"
diff --git a/server_addon/core/server/version.py b/server_addon/core/server/version.py
index ae7362549b..bbab0242f6 100644
--- a/server_addon/core/server/version.py
+++ b/server_addon/core/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.3"
+__version__ = "0.1.4"
diff --git a/server_addon/deadline/server/settings/main.py b/server_addon/deadline/server/settings/main.py
index f158b7464d..f766ef9db8 100644
--- a/server_addon/deadline/server/settings/main.py
+++ b/server_addon/deadline/server/settings/main.py
@@ -14,15 +14,35 @@ class ServerListSubmodel(BaseSettingsModel):
value: str = Field(title="Value")
+async def defined_deadline_ws_name_enum_resolver(
+ addon: "BaseServerAddon",
+ settings_variant: str = "production",
+ project_name: str | None = None,
+) -> list[str]:
+ """Provides list of names of configured Deadline webservice urls."""
+ if addon is None:
+ return []
+
+ settings = await addon.get_studio_settings(variant=settings_variant)
+
+ ws_urls = []
+ for deadline_url_item in settings.deadline_urls:
+ ws_urls.append(deadline_url_item.name)
+
+ return ws_urls
+
+
class DeadlineSettings(BaseSettingsModel):
deadline_urls: list[ServerListSubmodel] = Field(
default_factory=list,
title="System Deadline Webservice URLs",
scope=["studio"],
)
- deadline_servers: list[str] = Field(
- title="Project deadline servers",
+ deadline_server: str = Field(
+ title="Project deadline server",
section="---",
+ scope=["project"],
+ enum_resolver=defined_deadline_ws_name_enum_resolver
)
publish: PublishPluginsModel = Field(
default_factory=PublishPluginsModel,
@@ -42,7 +62,6 @@ DEFAULT_VALUES = {
"value": "http://127.0.0.1:8082"
}
],
- # TODO: this needs to be dynamic from "deadline_urls"
- "deadline_servers": [],
+ "deadline_server": "default",
"publish": DEFAULT_DEADLINE_PLUGINS_SETTINGS
}
diff --git a/server_addon/deadline/server/settings/publish_plugins.py b/server_addon/deadline/server/settings/publish_plugins.py
index 7915308d2f..a989f3ad9d 100644
--- a/server_addon/deadline/server/settings/publish_plugins.py
+++ b/server_addon/deadline/server/settings/publish_plugins.py
@@ -3,12 +3,6 @@ from pydantic import Field, validator
from ayon_server.settings import BaseSettingsModel, ensure_unique_names
-class CollectDefaultDeadlineServerModel(BaseSettingsModel):
- """Settings for event handlers running in ftrack service."""
-
- pass_mongo_url: bool = Field(title="Pass Mongo url to job")
-
-
class CollectDeadlinePoolsModel(BaseSettingsModel):
"""Settings Deadline default pools."""
@@ -237,6 +231,7 @@ class BlenderSubmitDeadlineModel(BaseSettingsModel):
priority: int = Field(title="Priority")
chunk_size: int = Field(title="Frame per Task")
group: str = Field("", title="Group Name")
+ job_delay: str = Field("", title="Delay job (timecode dd:hh:mm:ss)")
class AOVFilterSubmodel(BaseSettingsModel):
@@ -285,12 +280,6 @@ class ProcessSubmittedJobOnFarmModel(BaseSettingsModel):
class PublishPluginsModel(BaseSettingsModel):
- CollectDefaultDeadlineServer: CollectDefaultDeadlineServerModel = Field(
- default_factory=CollectDefaultDeadlineServerModel,
- title="Default Deadline Webservice")
- CollectDefaultDeadlineServer: CollectDefaultDeadlineServerModel = Field(
- default_factory=CollectDefaultDeadlineServerModel,
- title="Default Deadline Webservice")
CollectDeadlinePools: CollectDeadlinePoolsModel = Field(
default_factory=CollectDeadlinePoolsModel,
title="Default Pools")
@@ -331,9 +320,6 @@ class PublishPluginsModel(BaseSettingsModel):
DEFAULT_DEADLINE_PLUGINS_SETTINGS = {
- "CollectDefaultDeadlineServer": {
- "pass_mongo_url": True
- },
"CollectDeadlinePools": {
"primary_pool": "",
"secondary_pool": ""
@@ -438,7 +424,8 @@ DEFAULT_DEADLINE_PLUGINS_SETTINGS = {
"use_published": True,
"priority": 50,
"chunk_size": 10,
- "group": "none"
+ "group": "none",
+ "job_delay": "00:00:00:00"
},
"ProcessSubmittedCacheJobOnFarm": {
"enabled": True,
diff --git a/server_addon/deadline/server/version.py b/server_addon/deadline/server/version.py
index bbab0242f6..1276d0254f 100644
--- a/server_addon/deadline/server/version.py
+++ b/server_addon/deadline/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.4"
+__version__ = "0.1.5"
diff --git a/server_addon/fusion/server/settings.py b/server_addon/fusion/server/settings.py
index 92fb362c66..1bc12773d2 100644
--- a/server_addon/fusion/server/settings.py
+++ b/server_addon/fusion/server/settings.py
@@ -25,6 +25,16 @@ def _create_saver_instance_attributes_enum():
]
+def _image_format_enum():
+ return [
+ {"value": "exr", "label": "exr"},
+ {"value": "tga", "label": "tga"},
+ {"value": "png", "label": "png"},
+ {"value": "tif", "label": "tif"},
+ {"value": "jpg", "label": "jpg"},
+ ]
+
+
class CreateSaverPluginModel(BaseSettingsModel):
_isGroup = True
temp_rendering_path_template: str = Field(
@@ -39,6 +49,10 @@ class CreateSaverPluginModel(BaseSettingsModel):
enum_resolver=_create_saver_instance_attributes_enum,
title="Instance attributes"
)
+ image_format: str = Field(
+ enum_resolver=_image_format_enum,
+ title="Output Image Format"
+ )
class CreatPluginsModel(BaseSettingsModel):
@@ -89,7 +103,8 @@ DEFAULT_VALUES = {
"instance_attributes": [
"reviewable",
"farm_rendering"
- ]
+ ],
+ "image_format": "exr"
}
}
}
diff --git a/server_addon/fusion/server/version.py b/server_addon/fusion/server/version.py
index 3dc1f76bc6..485f44ac21 100644
--- a/server_addon/fusion/server/version.py
+++ b/server_addon/fusion/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.0"
+__version__ = "0.1.1"
diff --git a/server_addon/hiero/server/settings/scriptsmenu.py b/server_addon/hiero/server/settings/scriptsmenu.py
index 51cb088298..ea898dd7ff 100644
--- a/server_addon/hiero/server/settings/scriptsmenu.py
+++ b/server_addon/hiero/server/settings/scriptsmenu.py
@@ -28,14 +28,14 @@ class ScriptsmenuSettings(BaseSettingsModel):
DEFAULT_SCRIPTSMENU_SETTINGS = {
- "name": "OpenPype Tools",
+ "name": "Custom Tools",
"definition": [
{
"type": "action",
"sourcetype": "python",
- "title": "OpenPype Docs",
- "command": "import webbrowser;webbrowser.open(url='https://openpype.io/docs/artist_hosts_hiero')",
- "tooltip": "Open the OpenPype Hiero user doc page"
+ "title": "Ayon Hiero Docs",
+ "command": "import webbrowser;webbrowser.open(url='https://ayon.ynput.io/docs/addon_hiero_artist')", # noqa
+ "tooltip": "Open the Ayon Hiero user doc page"
}
]
}
diff --git a/server_addon/hiero/server/version.py b/server_addon/hiero/server/version.py
index 3dc1f76bc6..485f44ac21 100644
--- a/server_addon/hiero/server/version.py
+++ b/server_addon/hiero/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.0"
+__version__ = "0.1.1"
diff --git a/server_addon/houdini/server/settings/create.py b/server_addon/houdini/server/settings/create.py
index e8db917849..a5ca4d477b 100644
--- a/server_addon/houdini/server/settings/create.py
+++ b/server_addon/houdini/server/settings/create.py
@@ -52,6 +52,9 @@ class CreatePluginsModel(BaseSettingsModel):
CreateKarmaROP: CreatorModel = Field(
default_factory=CreatorModel,
title="Create Karma ROP")
+ CreateMantraIFD: CreatorModel = Field(
+ default_factory=CreatorModel,
+ title="Create Mantra IFD")
CreateMantraROP: CreatorModel = Field(
default_factory=CreatorModel,
title="Create Mantra ROP")
@@ -114,6 +117,10 @@ DEFAULT_HOUDINI_CREATE_SETTINGS = {
"enabled": True,
"default_variants": ["Main"]
},
+ "CreateMantraIFD": {
+ "enabled": True,
+ "default_variants": ["Main"]
+ },
"CreateMantraROP": {
"enabled": True,
"default_variants": ["Main"]
diff --git a/server_addon/houdini/server/settings/publish.py b/server_addon/houdini/server/settings/publish.py
index 92a676b0d0..f551b3a209 100644
--- a/server_addon/houdini/server/settings/publish.py
+++ b/server_addon/houdini/server/settings/publish.py
@@ -13,6 +13,14 @@ class CollectAssetHandlesModel(BaseSettingsModel):
title="Use asset handles")
+class CollectChunkSizeModel(BaseSettingsModel):
+ """Collect Chunk Size."""
+ enabled: bool = Field(title="Enabled")
+ optional: bool = Field(title="Optional")
+ chunk_size: int = Field(
+ title="Frames Per Task")
+
+
class ValidateWorkfilePathsModel(BaseSettingsModel):
enabled: bool = Field(title="Enabled")
optional: bool = Field(title="Optional")
@@ -38,6 +46,10 @@ class PublishPluginsModel(BaseSettingsModel):
title="Collect Asset Handles.",
section="Collectors"
)
+ CollectChunkSize: CollectChunkSizeModel = Field(
+ default_factory=CollectChunkSizeModel,
+ title="Collect Chunk Size."
+ )
ValidateContainers: BasicValidateModel = Field(
default_factory=BasicValidateModel,
title="Validate Latest Containers.",
@@ -63,6 +75,11 @@ DEFAULT_HOUDINI_PUBLISH_SETTINGS = {
"CollectAssetHandles": {
"use_asset_handles": True
},
+ "CollectChunkSize": {
+ "enabled": True,
+ "optional": True,
+ "chunk_size": 999999
+ },
"ValidateContainers": {
"enabled": True,
"optional": True,
diff --git a/server_addon/houdini/server/version.py b/server_addon/houdini/server/version.py
index 75cf7831c4..6232f7ab18 100644
--- a/server_addon/houdini/server/version.py
+++ b/server_addon/houdini/server/version.py
@@ -1 +1 @@
-__version__ = "0.2.9"
+__version__ = "0.2.10"
diff --git a/server_addon/max/server/settings/publishers.py b/server_addon/max/server/settings/publishers.py
index b48f14a064..d40d85a99b 100644
--- a/server_addon/max/server/settings/publishers.py
+++ b/server_addon/max/server/settings/publishers.py
@@ -68,6 +68,28 @@ class PublishersModel(BaseSettingsModel):
default_factory=ValidateLoadedPluginModel,
title="Validate Loaded Plugin"
)
+ ExtractModelObj: BasicValidateModel = Field(
+ default_factory=BasicValidateModel,
+ title="Extract OBJ",
+ section="Extractors"
+ )
+ ExtractModelFbx: BasicValidateModel = Field(
+ default_factory=BasicValidateModel,
+ title="Extract FBX"
+ )
+ ExtractModelUSD: BasicValidateModel = Field(
+ default_factory=BasicValidateModel,
+ title="Extract Geometry (USD)"
+ )
+ ExtractModel: BasicValidateModel = Field(
+ default_factory=BasicValidateModel,
+ title="Extract Geometry (Alembic)"
+ )
+ ExtractMaxSceneRaw: BasicValidateModel = Field(
+ default_factory=BasicValidateModel,
+ title="Extract Max Scene (Raw)"
+ )
+
DEFAULT_PUBLISH_SETTINGS = {
"ValidateFrameRange": {
@@ -83,5 +105,30 @@ DEFAULT_PUBLISH_SETTINGS = {
"enabled": False,
"optional": True,
"family_plugins_mapping": []
+ },
+ "ExtractModelObj": {
+ "enabled": True,
+ "optional": True,
+ "active": False
+ },
+ "ExtractModelFbx": {
+ "enabled": True,
+ "optional": True,
+ "active": False
+ },
+ "ExtractModelUSD": {
+ "enabled": True,
+ "optional": True,
+ "active": False
+ },
+ "ExtractModel": {
+ "enabled": True,
+ "optional": True,
+ "active": True
+ },
+ "ExtractMaxSceneRaw": {
+ "enabled": True,
+ "optional": True,
+ "active": True
}
}
diff --git a/server_addon/max/server/version.py b/server_addon/max/server/version.py
index b3f4756216..ae7362549b 100644
--- a/server_addon/max/server/version.py
+++ b/server_addon/max/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.2"
+__version__ = "0.1.3"
diff --git a/server_addon/maya/server/settings/main.py b/server_addon/maya/server/settings/main.py
index c8021614be..a5b573a75e 100644
--- a/server_addon/maya/server/settings/main.py
+++ b/server_addon/maya/server/settings/main.py
@@ -97,11 +97,12 @@ DEFAULT_MEL_WORKSPACE_SETTINGS = "\n".join((
'workspace -fr "renderData" "renderData";',
'workspace -fr "sourceImages" "sourceimages";',
'workspace -fr "fileCache" "cache/nCache";',
+ 'workspace -fr "autoSave" "autosave";',
'',
))
DEFAULT_MAYA_SETTING = {
- "open_workfile_post_initialization": False,
+ "open_workfile_post_initialization": True,
"explicit_plugins_loading": DEFAULT_EXPLITCIT_PLUGINS_LOADING_SETTINGS,
"imageio": DEFAULT_IMAGEIO_SETTINGS,
"mel_workspace": DEFAULT_MEL_WORKSPACE_SETTINGS,
diff --git a/server_addon/maya/server/settings/publishers.py b/server_addon/maya/server/settings/publishers.py
index dd8d4a0a37..e823efe681 100644
--- a/server_addon/maya/server/settings/publishers.py
+++ b/server_addon/maya/server/settings/publishers.py
@@ -785,7 +785,7 @@ DEFAULT_PUBLISH_SETTINGS = {
"sync_workfile_version": False
},
"CollectFbxAnimation": {
- "enabled": True
+ "enabled": False
},
"CollectFbxCamera": {
"enabled": False
@@ -862,7 +862,7 @@ DEFAULT_PUBLISH_SETTINGS = {
]
},
"ValidatePluginPathAttributes": {
- "enabled": True,
+ "enabled": False,
"optional": False,
"active": True,
"attribute": [
@@ -917,12 +917,12 @@ DEFAULT_PUBLISH_SETTINGS = {
"active": True
},
"ValidateGLSLMaterial": {
- "enabled": True,
+ "enabled": False,
"optional": False,
"active": True
},
"ValidateGLSLPlugin": {
- "enabled": True,
+ "enabled": False,
"optional": False,
"active": True
},
@@ -1154,7 +1154,7 @@ DEFAULT_PUBLISH_SETTINGS = {
"active": True
},
"ExtractProxyAlembic": {
- "enabled": True,
+ "enabled": False,
"families": [
"proxyAbc"
]
@@ -1311,7 +1311,7 @@ DEFAULT_PUBLISH_SETTINGS = {
"bake_attributes": "[]"
},
"ExtractGLB": {
- "enabled": True,
+ "enabled": False,
"active": True,
"ogsfx_path": "/maya2glTF/PBR/shaders/glTF_PBR.ogsfx"
},
diff --git a/server_addon/maya/server/settings/scriptsmenu.py b/server_addon/maya/server/settings/scriptsmenu.py
index 82c1c2e53c..4ac2263f7a 100644
--- a/server_addon/maya/server/settings/scriptsmenu.py
+++ b/server_addon/maya/server/settings/scriptsmenu.py
@@ -26,7 +26,7 @@ class ScriptsmenuModel(BaseSettingsModel):
DEFAULT_SCRIPTSMENU_SETTINGS = {
- "name": "OpenPype Tools",
+ "name": "Custom Tools",
"definition": [
{
"type": "action",
diff --git a/server_addon/maya/server/settings/workfile_build_settings.py b/server_addon/maya/server/settings/workfile_build_settings.py
index dc56d1a320..2c7fea85c4 100644
--- a/server_addon/maya/server/settings/workfile_build_settings.py
+++ b/server_addon/maya/server/settings/workfile_build_settings.py
@@ -104,7 +104,7 @@ DEFAULT_WORKFILE_SETTING = {
{
"product_name_filters": [],
"product_types": [
- "sedress"
+ "setdress"
],
"repre_names": [
"ma"
diff --git a/server_addon/maya/server/version.py b/server_addon/maya/server/version.py
index 805897cda3..b87834cc35 100644
--- a/server_addon/maya/server/version.py
+++ b/server_addon/maya/server/version.py
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
"""Package declaring addon version."""
-__version__ = "0.1.6"
+__version__ = "0.1.7"
diff --git a/server_addon/nuke/server/settings/publish_plugins.py b/server_addon/nuke/server/settings/publish_plugins.py
index 81663fa5aa..84457d2484 100644
--- a/server_addon/nuke/server/settings/publish_plugins.py
+++ b/server_addon/nuke/server/settings/publish_plugins.py
@@ -51,17 +51,6 @@ class NodeModel(BaseSettingsModel):
return value
-class ThumbnailRepositionNodeModel(BaseSettingsModel):
- node_class: str = Field(title="Node class")
- knobs: list[KnobModel] = Field(title="Knobs", default_factory=list)
-
- @validator("knobs")
- def ensure_unique_names(cls, value):
- """Ensure name fields within the lists have unique names."""
- ensure_unique_names(value)
- return value
-
-
class CollectInstanceDataModel(BaseSettingsModel):
sync_workfile_version_on_product_types: list[str] = Field(
default_factory=list,
@@ -89,22 +78,6 @@ class ValidateKnobsModel(BaseSettingsModel):
return validate_json_dict(value)
-class ExtractThumbnailModel(BaseSettingsModel):
- enabled: bool = Field(title="Enabled")
- use_rendered: bool = Field(title="Use rendered images")
- bake_viewer_process: bool = Field(title="Bake view process")
- bake_viewer_input_process: bool = Field(title="Bake viewer input process")
-
- nodes: list[NodeModel] = Field(
- default_factory=list,
- title="Nodes (deprecated)"
- )
- reposition_nodes: list[ThumbnailRepositionNodeModel] = Field(
- title="Reposition nodes",
- default_factory=list
- )
-
-
class ExtractReviewDataModel(BaseSettingsModel):
enabled: bool = Field(title="Enabled")
@@ -153,16 +126,29 @@ class IntermediateOutputModel(BaseSettingsModel):
name: str = Field(title="Output name")
filter: BakingStreamFilterModel = Field(
title="Filter", default_factory=BakingStreamFilterModel)
- read_raw: bool = Field(title="Read raw switch")
- viewer_process_override: str = Field(title="Viewer process override")
- bake_viewer_process: bool = Field(title="Bake viewer process")
+ read_raw: bool = Field(
+ False,
+ title="Read raw switch"
+ )
+ viewer_process_override: str = Field(
+ "",
+ title="Viewer process override"
+ )
+ bake_viewer_process: bool = Field(
+ True,
+ title="Bake viewer process"
+ )
bake_viewer_input_process: bool = Field(
+ True,
title="Bake viewer input process node (LUT)"
)
reformat_nodes_config: ReformatNodesConfigModel = Field(
default_factory=ReformatNodesConfigModel,
title="Reformat Nodes")
- extension: str = Field(title="File extension")
+ extension: str = Field(
+ "mov",
+ title="File extension"
+ )
add_custom_tags: list[str] = Field(
title="Custom tags", default_factory=list)
@@ -267,11 +253,6 @@ class PublishPuginsModel(BaseSettingsModel):
title="Validate workfile attributes",
default_factory=OptionalPluginModel
)
- ExtractThumbnail: ExtractThumbnailModel = Field(
- title="Extract Thumbnail",
- default_factory=ExtractThumbnailModel,
- section="Extractors"
- )
ExtractReviewData: ExtractReviewDataModel = Field(
title="Extract Review Data",
default_factory=ExtractReviewDataModel
@@ -350,78 +331,6 @@ DEFAULT_PUBLISH_PLUGIN_SETTINGS = {
"optional": True,
"active": True
},
- "ExtractThumbnail": {
- "enabled": True,
- "use_rendered": True,
- "bake_viewer_process": True,
- "bake_viewer_input_process": True,
- "nodes": [
- {
- "name": "Reformat01",
- "nodeclass": "Reformat",
- "dependency": "",
- "knobs": [
- {
- "type": "text",
- "name": "type",
- "text": "to format"
- },
- {
- "type": "text",
- "name": "format",
- "text": "HD_1080"
- },
- {
- "type": "text",
- "name": "filter",
- "text": "Lanczos6"
- },
- {
- "type": "boolean",
- "name": "black_outside",
- "boolean": True
- },
- {
- "type": "boolean",
- "name": "pbb",
- "boolean": False
- }
- ]
- }
- ],
- "reposition_nodes": [
- {
- "node_class": "Reformat",
- "knobs": [
- {
- "type": "text",
- "name": "type",
- "text": "to format"
- },
- {
- "type": "text",
- "name": "format",
- "text": "HD_1080"
- },
- {
- "type": "text",
- "name": "filter",
- "text": "Lanczos6"
- },
- {
- "type": "boolean",
- "name": "black_outside",
- "boolean": True
- },
- {
- "type": "boolean",
- "name": "pbb",
- "boolean": False
- }
- ]
- }
- ]
- },
"ExtractReviewData": {
"enabled": False
},
diff --git a/server_addon/nuke/server/settings/scriptsmenu.py b/server_addon/nuke/server/settings/scriptsmenu.py
index 0b2d660da5..3dd6765920 100644
--- a/server_addon/nuke/server/settings/scriptsmenu.py
+++ b/server_addon/nuke/server/settings/scriptsmenu.py
@@ -26,27 +26,27 @@ class ScriptsmenuSettings(BaseSettingsModel):
DEFAULT_SCRIPTSMENU_SETTINGS = {
- "name": "OpenPype Tools",
+ "name": "Custom Tools",
"definition": [
{
"type": "action",
"sourcetype": "python",
- "title": "OpenPype Docs",
- "command": "import webbrowser;webbrowser.open(url='https://openpype.io/docs/artist_hosts_nuke_tut')",
- "tooltip": "Open the OpenPype Nuke user doc page"
+ "title": "Ayon Nuke Docs",
+ "command": "import webbrowser;webbrowser.open(url='https://ayon.ynput.io/docs/addon_nuke_artist')", # noqa
+ "tooltip": "Open the Ayon Nuke user doc page"
},
{
"type": "action",
"sourcetype": "python",
"title": "Set Frame Start (Read Node)",
- "command": "from openpype.hosts.nuke.startup.frame_setting_for_read_nodes import main;main();",
+ "command": "from openpype.hosts.nuke.startup.frame_setting_for_read_nodes import main;main();", # noqa
"tooltip": "Set frame start for read node(s)"
},
{
"type": "action",
"sourcetype": "python",
"title": "Set non publish output for Write Node",
- "command": "from openpype.hosts.nuke.startup.custom_write_node import main;main();",
+ "command": "from openpype.hosts.nuke.startup.custom_write_node import main;main();", # noqa
"tooltip": "Open the OpenPype Nuke user doc page"
}
]
diff --git a/server_addon/nuke/server/version.py b/server_addon/nuke/server/version.py
index 1276d0254f..f1380eede2 100644
--- a/server_addon/nuke/server/version.py
+++ b/server_addon/nuke/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.7"
diff --git a/server_addon/photoshop/server/settings/publish_plugins.py b/server_addon/photoshop/server/settings/publish_plugins.py
index 6bc72b4072..21e7d670f0 100644
--- a/server_addon/photoshop/server/settings/publish_plugins.py
+++ b/server_addon/photoshop/server/settings/publish_plugins.py
@@ -29,7 +29,7 @@ class ColorCodeMappings(BaseSettingsModel):
)
layer_name_regex: list[str] = Field(
- "",
+ default_factory=list,
title="Layer name regex"
)
@@ -150,7 +150,7 @@ class PhotoshopPublishPlugins(BaseSettingsModel):
)
CollectVersion: CollectVersionPlugin = Field(
- title="Create Image",
+ title="Collect Version",
default_factory=CollectVersionPlugin,
)
diff --git a/server_addon/photoshop/server/settings/workfile_builder.py b/server_addon/photoshop/server/settings/workfile_builder.py
index ec2ee136ad..68db05270d 100644
--- a/server_addon/photoshop/server/settings/workfile_builder.py
+++ b/server_addon/photoshop/server/settings/workfile_builder.py
@@ -1,31 +1,18 @@
from pydantic import Field
-from pathlib import Path
-from ayon_server.settings import BaseSettingsModel
-
-
-class PathsTemplate(BaseSettingsModel):
- windows: Path = Field(
- '',
- title="Windows"
- )
- darwin: Path = Field(
- '',
- title="MacOS"
- )
- linux: Path = Field(
- '',
- title="Linux"
- )
+from ayon_server.settings import BaseSettingsModel, MultiplatformPathModel
class CustomBuilderTemplate(BaseSettingsModel):
+ _layout = "expanded"
task_types: list[str] = Field(
default_factory=list,
title="Task types",
)
- template_path: PathsTemplate = Field(
- default_factory=PathsTemplate
+
+ path: MultiplatformPathModel = Field(
+ default_factory=MultiplatformPathModel,
+ title="Template path"
)
@@ -37,5 +24,6 @@ class WorkfileBuilderPlugin(BaseSettingsModel):
)
custom_templates: list[CustomBuilderTemplate] = Field(
- default_factory=CustomBuilderTemplate
+ default_factory=CustomBuilderTemplate,
+ title="Template profiles"
)
diff --git a/server_addon/photoshop/server/version.py b/server_addon/photoshop/server/version.py
index d4b9e2d7f3..a242f0e757 100644
--- a/server_addon/photoshop/server/version.py
+++ b/server_addon/photoshop/server/version.py
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
"""Package declaring addon version."""
-__version__ = "0.1.0"
+__version__ = "0.1.1"
diff --git a/server_addon/unreal/server/settings.py b/server_addon/unreal/server/settings.py
index 479e041e25..110ccc563a 100644
--- a/server_addon/unreal/server/settings.py
+++ b/server_addon/unreal/server/settings.py
@@ -53,11 +53,11 @@ class UnrealSettings(BaseSettingsModel):
DEFAULT_VALUES = {
- "level_sequences_for_layouts": False,
+ "level_sequences_for_layouts": True,
"delete_unmatched_assets": False,
"render_config_path": "",
"preroll_frames": 0,
- "render_format": "png",
+ "render_format": "exr",
"project_setup": {
"dev_mode": False
}
diff --git a/start.py b/start.py
index 3b020c76c0..54a252ccf3 100644
--- a/start.py
+++ b/start.py
@@ -366,8 +366,8 @@ def run_disk_mapping_commands(settings):
destination = destination.replace("/", "\\").rstrip("\\")
source = source.replace("/", "\\").rstrip("\\")
# Add slash after ':' ('G:' -> 'G:\')
- if destination.endswith(":"):
- destination += "\\"
+ if source.endswith(":"):
+ source += "\\"
else:
destination = destination.rstrip("/")
source = source.rstrip("/")
diff --git a/tests/conftest.py b/tests/conftest.py
index 028c19bc5f..cb4806998a 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -39,6 +39,11 @@ def pytest_addoption(parser):
help="Provide url of the Mongo database."
)
+ parser.addoption(
+ "--dump_databases", action="store", default=None,
+ help="Dump databases to data folder."
+ )
+
@pytest.fixture(scope="module")
def test_data_folder(request):
@@ -75,6 +80,11 @@ def mongo_url(request):
return request.config.getoption("--mongo_url")
+@pytest.fixture(scope="module")
+def dump_databases(request):
+ return request.config.getoption("--dump_databases")
+
+
@pytest.hookimpl(tryfirst=True, hookwrapper=True)
def pytest_runtest_makereport(item, call):
# execute all other hooks to obtain the report object
diff --git a/tests/integration/README.md b/tests/integration/README.md
index 7b9b7cd706..1e45b55ed5 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -29,7 +29,7 @@ Command line arguments
- "--timeout" - "Provide specific timeout value for test case",
- "--setup_only" - "Only create dbs, do not run tests",
- "--mongo_url" - "MongoDB for testing.",
-
+ - "--dump_databases" - ("json"|"bson") export database in expected format after successful test (to output folder in temp location - which is made persistent by this, must be cleared manually)
Run Tray for test
-----------------
In case of failed test you might want to run it manually and visually debug what happened.
diff --git a/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects.py b/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects.py
index 30761693a8..1aa612207d 100644
--- a/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects.py
+++ b/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects.py
@@ -60,7 +60,7 @@ class TestDeadlinePublishInAfterEffects(AEDeadlinePublishTestClass):
name="renderTest_taskMain"))
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 4))
+ DBAssert.count_of_types(dbcon, "representation", 3))
additional_args = {"context.subset": "workfileTest_task",
"context.ext": "aep"}
@@ -77,7 +77,7 @@ class TestDeadlinePublishInAfterEffects(AEDeadlinePublishTestClass):
additional_args = {"context.subset": "renderTest_taskMain",
"name": "thumbnail"}
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 1,
+ DBAssert.count_of_types(dbcon, "representation", 0,
additional_args=additional_args))
additional_args = {"context.subset": "renderTest_taskMain",
diff --git a/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects_multicomposition.py b/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects_multicomposition.py
index 0e9cd3b00d..4254b951b5 100644
--- a/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects_multicomposition.py
+++ b/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects_multicomposition.py
@@ -71,7 +71,7 @@ class TestDeadlinePublishInAfterEffectsMultiComposition(AEDeadlinePublishTestCla
name="renderTest_taskMain2"))
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 5))
+ DBAssert.count_of_types(dbcon, "representation", 4))
additional_args = {"context.subset": "workfileTest_task",
"context.ext": "aep"}
@@ -89,7 +89,7 @@ class TestDeadlinePublishInAfterEffectsMultiComposition(AEDeadlinePublishTestCla
additional_args = {"context.subset": "renderTest_taskMain",
"name": "thumbnail"}
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 1,
+ DBAssert.count_of_types(dbcon, "representation", 0,
additional_args=additional_args))
additional_args = {"context.subset": "renderTest_taskMain",
diff --git a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py
index 2e4f343a5a..f13043d8bb 100644
--- a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py
+++ b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py
@@ -58,7 +58,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
name="renderTest_taskMain"))
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 4))
+ DBAssert.count_of_types(dbcon, "representation", 3))
additional_args = {"context.subset": "workfileTest_task",
"context.ext": "aep"}
@@ -75,7 +75,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
additional_args = {"context.subset": "renderTest_taskMain",
"name": "thumbnail"}
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 1,
+ DBAssert.count_of_types(dbcon, "representation", 0,
additional_args=additional_args))
additional_args = {"context.subset": "renderTest_taskMain",
diff --git a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_legacy.py b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_legacy.py
index a62036e4a7..0d97da6b8b 100644
--- a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_legacy.py
+++ b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_legacy.py
@@ -60,7 +60,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
name="renderTest_taskMain"))
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 4))
+ DBAssert.count_of_types(dbcon, "representation", 3))
additional_args = {"context.subset": "workfileTest_task",
"context.ext": "aep"}
@@ -77,7 +77,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
additional_args = {"context.subset": "renderTest_taskMain",
"name": "thumbnail"}
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 1,
+ DBAssert.count_of_types(dbcon, "representation", 0,
additional_args=additional_args))
additional_args = {"context.subset": "renderTest_taskMain",
@@ -89,7 +89,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
additional_args = {"context.subset": "renderTest_taskMain",
"name": "thumbnail"}
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 1,
+ DBAssert.count_of_types(dbcon, "representation", 0,
additional_args=additional_args))
additional_args = {"context.subset": "renderTest_taskMain",
diff --git a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py
index dcf34844d1..bd9d3e9b50 100644
--- a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py
+++ b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py
@@ -45,7 +45,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
name="renderTest_taskMain"))
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 4))
+ DBAssert.count_of_types(dbcon, "representation", 3))
additional_args = {"context.subset": "workfileTest_task",
"context.ext": "aep"}
@@ -62,7 +62,7 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
additional_args = {"context.subset": "renderTest_taskMain",
"name": "thumbnail"}
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 1,
+ DBAssert.count_of_types(dbcon, "representation", 0,
additional_args=additional_args))
additional_args = {"context.subset": "renderTest_taskMain",
diff --git a/tests/integration/hosts/maya/test_deadline_publish_in_maya.py b/tests/integration/hosts/maya/test_deadline_publish_in_maya.py
index c2ef342600..79d6c22a26 100644
--- a/tests/integration/hosts/maya/test_deadline_publish_in_maya.py
+++ b/tests/integration/hosts/maya/test_deadline_publish_in_maya.py
@@ -21,7 +21,7 @@ class TestDeadlinePublishInMaya(MayaDeadlinePublishTestClass):
{OPENPYPE_ROOT}/.venv/Scripts/python.exe {OPENPYPE_ROOT}/start.py runtests ../tests/integration/hosts/maya # noqa: E501
"""
- PERSIST = True
+ PERSIST = False
TEST_FILES = [
("test_deadline_publish_in_maya", "", "")
@@ -54,7 +54,7 @@ class TestDeadlinePublishInMaya(MayaDeadlinePublishTestClass):
DBAssert.count_of_types(dbcon, "subset", 1,
name="workfileTest_task"))
- failures.append(DBAssert.count_of_types(dbcon, "representation", 8))
+ failures.append(DBAssert.count_of_types(dbcon, "representation", 7))
# hero included
additional_args = {"context.subset": "modelMain",
@@ -85,7 +85,7 @@ class TestDeadlinePublishInMaya(MayaDeadlinePublishTestClass):
additional_args = {"context.subset": "renderTest_taskMain_beauty",
"context.ext": "jpg"}
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 1,
+ DBAssert.count_of_types(dbcon, "representation", 0,
additional_args=additional_args))
additional_args = {"context.subset": "renderTest_taskMain_beauty",
diff --git a/tests/integration/hosts/maya/test_deadline_publish_in_maya/expected/test_project/test_asset/publish/render/renderTest_taskMain_beauty/v001/test_project_test_asset_renderTest_taskMain_beauty_v001.jpg b/tests/integration/hosts/maya/test_deadline_publish_in_maya/expected/test_project/test_asset/publish/render/renderTest_taskMain_beauty/v001/test_project_test_asset_renderTest_taskMain_beauty_v001.jpg
deleted file mode 100644
index 79ff799e8b..0000000000
Binary files a/tests/integration/hosts/maya/test_deadline_publish_in_maya/expected/test_project/test_asset/publish/render/renderTest_taskMain_beauty/v001/test_project_test_asset_renderTest_taskMain_beauty_v001.jpg and /dev/null differ
diff --git a/tests/integration/hosts/maya/test_deadline_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma b/tests/integration/hosts/maya/test_deadline_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma
index c476a78086..2e882a5baa 100644
--- a/tests/integration/hosts/maya/test_deadline_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma
+++ b/tests/integration/hosts/maya/test_deadline_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma
@@ -236,6 +236,7 @@ createNode polyDisc -n "polyDisc1";
rename -uid "9ED8A7BD-4FFD-6107-4322-35ACD1D3AC42";
createNode aiOptions -s -n "defaultArnoldRenderOptions";
rename -uid "31A81965-48A6-B90D-503D-2FA162B7C982";
+ setAttr ".skip_license_check" yes;
createNode aiAOVFilter -s -n "defaultArnoldFilter";
rename -uid "77A2BCB1-4613-905E-080E-B997FD5E1C6F";
setAttr ".ai_translator" -type "string" "gaussian";
diff --git a/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/publish/workfile/workfileTest_task/v001/test_project_test_asset_workfileTest_task_v001.ma b/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/publish/workfile/workfileTest_task/v001/test_project_test_asset_workfileTest_task_v001.ma
index e438d80d5f..2cc87c2f48 100644
--- a/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/publish/workfile/workfileTest_task/v001/test_project_test_asset_workfileTest_task_v001.ma
+++ b/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/publish/workfile/workfileTest_task/v001/test_project_test_asset_workfileTest_task_v001.ma
@@ -1,22 +1,22 @@
-//Maya ASCII 2022 scene
-//Name: test_project_test_asset_test_task_v001.ma
-//Last modified: Thu, Sep 14, 2023 06:31:00 PM
+//Maya ASCII 2023 scene
+//Name: test_project_test_asset_test_task_v002.ma
+//Last modified: Thu, Dec 07, 2023 03:53:06 PM
//Codeset: 1252
-requires maya "2022";
-requires -nodeType "polyDisc" "modelingToolkit" "0.0.0.0";
-requires "stereoCamera" "10.0";
-requires -nodeType "aiOptions" -nodeType "aiAOVDriver" -nodeType "aiAOVFilter" "mtoa" "5.2.2.1";
+requires maya "2023";
requires -nodeType "simpleSelector" -nodeType "renderSetupLayer" -nodeType "renderSetup"
-nodeType "collection" "renderSetup.py" "1.0";
requires "stereoCamera" "10.0";
+requires -nodeType "aiOptions" -nodeType "aiAOVDriver" -nodeType "aiAOVFilter" "mtoa" "5.2.1.1";
+requires -nodeType "polyDisc" "modelingToolkit" "0.0.0.0";
+requires "stereoCamera" "10.0";
currentUnit -l centimeter -a degree -t pal;
fileInfo "application" "maya";
-fileInfo "product" "Maya 2022";
-fileInfo "version" "2022";
-fileInfo "cutIdentifier" "202205171752-c25c06f306";
-fileInfo "osv" "Windows 10 Pro v2009 (Build: 19044)";
+fileInfo "product" "Maya 2023";
+fileInfo "version" "2023";
+fileInfo "cutIdentifier" "202211021031-847a9f9623";
+fileInfo "osv" "Windows 10 Pro v2009 (Build: 19045)";
fileInfo "license" "education";
-fileInfo "UUID" "019C7F50-40EF-1435-E27F-729F64685E67";
+fileInfo "UUID" "7A992745-4AD5-777F-5575-B4BFAC62B1D0";
fileInfo "OpenPypeContext" "eyJwdWJsaXNoX2F0dHJpYnV0ZXMiOiB7IlZhbGlkYXRlQ29udGFpbmVycyI6IHsiYWN0aXZlIjogdHJ1ZX19fQ==";
createNode transform -s -n "persp";
rename -uid "D52C935B-47C9-D868-A875-D799DD17B3A1";
@@ -142,19 +142,20 @@ createNode camera -n "perspShape1" -p "persp1";
setAttr ".hc" -type "string" "viewSet -p %camera";
setAttr ".dr" yes;
createNode lightLinker -s -n "lightLinker1";
- rename -uid "6B9ADCD4-41B9-5BCC-826D-4A874A278510";
+ rename -uid "09465BD3-42E5-18E4-7906-20A99BB2A6C0";
setAttr -s 2 ".lnk";
setAttr -s 2 ".slnk";
createNode shapeEditorManager -n "shapeEditorManager";
- rename -uid "5B4518C5-46C9-6921-690E-EFAF77B21A36";
+ rename -uid "9F2E8009-4D69-046B-FCC4-28A8CE8F86DB";
createNode poseInterpolatorManager -n "poseInterpolatorManager";
- rename -uid "8518F293-4F06-BFF2-647A-72A099FBF025";
+ rename -uid "6757AD81-40B0-A747-69C3-D9A56259571E";
createNode displayLayerManager -n "layerManager";
- rename -uid "04D880D5-4D86-0C58-CA3D-208ABE3E1E16";
+ rename -uid "6F055ED5-4D91-8F85-7951-B4A13543A561";
createNode displayLayer -n "defaultLayer";
rename -uid "4A776D1B-401F-7069-1C74-A7AAE84CEE03";
+ setAttr ".ufem" -type "stringArray" 0 ;
createNode renderLayerManager -n "renderLayerManager";
- rename -uid "B719B8BE-46BF-12E6-BEBA-B0AD4DBDBA87";
+ rename -uid "55626D2B-4FD5-61A1-7AB2-47B13F19D8AA";
setAttr -s 2 ".rlmi[1]" 1;
setAttr -s 2 ".rlmi";
createNode renderLayer -n "defaultRenderLayer";
@@ -167,6 +168,7 @@ createNode polySphere -n "polySphere1";
createNode objectSet -n "modelMain";
rename -uid "A76AD4F8-4CF5-AA0D-4E98-BABEE6454CC3";
addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
+ addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "id" -ln "id" -dt "string";
addAttr -ci true -sn "family" -ln "family" -dt "string";
addAttr -ci true -sn "subset" -ln "subset" -dt "string";
@@ -175,18 +177,19 @@ createNode objectSet -n "modelMain";
addAttr -ci true -sn "variant" -ln "variant" -dt "string";
addAttr -ci true -sn "asset" -ln "asset" -dt "string";
addAttr -ci true -sn "task" -ln "task" -dt "string";
- addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "writeColorSets" -ln "writeColorSets" -min 0 -max 1 -at "bool";
addAttr -ci true -sn "writeFaceSets" -ln "writeFaceSets" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "includeParentHierarchy" -ln "includeParentHierarchy" -min
+ addAttr -ci true -sn "includeParentHierarchy" -ln "includeParentHierarchy" -min
0 -max 1 -at "bool";
addAttr -ci true -sn "attr" -ln "attr" -dt "string";
addAttr -ci true -sn "attrPrefix" -ln "attrPrefix" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
- addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
+ addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
+ addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string";
setAttr ".ihi" 0;
setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:7364ea6776c9";
+ setAttr ".instance_id" -type "string" "6889d3db-b813-43db-96de-9ba555dc4472";
setAttr ".id" -type "string" "pyblish.avalon.instance";
setAttr ".family" -type "string" "model";
setAttr ".subset" -type "string" "modelMain";
@@ -195,59 +198,68 @@ createNode objectSet -n "modelMain";
setAttr ".variant" -type "string" "Main";
setAttr ".asset" -type "string" "test_asset";
setAttr ".task" -type "string" "test_task";
- setAttr ".instance_id" -type "string" "6889d3db-b813-43db-96de-9ba555dc4472";
setAttr -cb on ".writeColorSets";
setAttr -cb on ".writeFaceSets";
setAttr -cb on ".includeParentHierarchy";
setAttr ".attr" -type "string" "";
setAttr ".attrPrefix" -type "string" "";
- setAttr ".publish_attributes" -type "string" "{\"ValidateNodeIDsRelated\": {\"active\": true}, \"ValidateTransformNamingSuffix\": {\"active\": true}, \"ValidateColorSets\": {\"active\": true}, \"ValidateMeshArnoldAttributes\": {\"active\": true}, \"ValidateMeshHasUVs\": {\"active\": true}, \"ValidateMeshNonZeroEdgeLength\": {\"active\": true}, \"ExtractModel\": {\"active\": true}}";
+ setAttr ".publish_attributes" -type "string" "{\"ValidateNodeIDsRelated\": {\"active\": true}, \"ValidateInstanceInContext\": {\"active\": true}, \"ValidateTransformNamingSuffix\": {\"active\": true}, \"ValidateColorSets\": {\"active\": true}, \"ValidateMeshHasUVs\": {\"active\": true}, \"ValidateMeshNonZeroEdgeLength\": {\"active\": true}, \"ExtractModel\": {\"active\": true}, \"ValidateMeshArnoldAttributes\": {\"active\": true}}";
+ setAttr ".creator_attributes" -type "string" "{}";
setAttr ".__creator_attributes_keys" -type "string" "writeColorSets,writeFaceSets,includeParentHierarchy,attr,attrPrefix";
createNode script -n "uiConfigurationScriptNode";
rename -uid "4B7AFB53-452E-E870-63E1-CCA1DD6EAF13";
setAttr ".b" -type "string" (
"// Maya Mel UI Configuration File.\n//\n// This script is machine generated. Edit at your own risk.\n//\n//\n\nglobal string $gMainPane;\nif (`paneLayout -exists $gMainPane`) {\n\n\tglobal int $gUseScenePanelConfig;\n\tint $useSceneConfig = $gUseScenePanelConfig;\n\tint $nodeEditorPanelVisible = stringArrayContains(\"nodeEditorPanel1\", `getPanel -vis`);\n\tint $nodeEditorWorkspaceControlOpen = (`workspaceControl -exists nodeEditorPanel1Window` && `workspaceControl -q -visible nodeEditorPanel1Window`);\n\tint $menusOkayInPanels = `optionVar -q allowMenusInPanels`;\n\tint $nVisPanes = `paneLayout -q -nvp $gMainPane`;\n\tint $nPanes = 0;\n\tstring $editorName;\n\tstring $panelName;\n\tstring $itemFilterName;\n\tstring $panelConfig;\n\n\t//\n\t// get current state of the UI\n\t//\n\tsceneUIReplacement -update $gMainPane;\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Top View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Top View\")) -mbv $menusOkayInPanels $panelName;\n"
- + "\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|top\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n"
+ + "\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|top\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n"
+ " -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n"
- + " -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 1\n -height 1\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n"
- + "\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Side View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Side View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|side\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n"
- + " -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n"
- + " -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 1\n -height 1\n"
- + " -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Front View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Front View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|front\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n"
- + " -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n"
- + " -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n"
- + " -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 1\n -height 1\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Persp View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Persp View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n"
- + " -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n"
- + " -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n"
- + " -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 1312\n -height 732\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"ToggledOutliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"ToggledOutliner\")) -mbv $menusOkayInPanels $panelName;\n"
- + "\t\t$editorName = $panelName;\n outlinerEditor -e \n -docTag \"isolOutln_fromSeln\" \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 1\n -showReferenceMembers 1\n -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n"
- + " -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -isSet 0\n -isSetMember 0\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -selectCommand \"print(\\\"\\\")\" \n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 1\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n -renderFilterIndex 0\n"
- + " -selectionOrder \"chronological\" \n -expandAttribute 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"Outliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"Outliner\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n outlinerEditor -e \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n"
- + " -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n"
- + " -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"graphEditor\" (localizedPanelLabel(\"Graph Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Graph Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n"
- + " -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 1\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 0\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 1\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 1\n -setFilter \"0\" \n -showSetMembers 0\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -displayMode \"DAG\" \n -expandObjects 0\n"
- + " -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 1\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"GraphEd\");\n animCurveEditor -e \n -displayValues 0\n -snapTime \"integer\" \n -snapValue \"none\" \n -showPlayRangeShades \"on\" \n -lockPlayRangeShades \"off\" \n -smoothness \"fine\" \n -resultSamples 1.041667\n"
- + " -resultScreenSamples 0\n -resultUpdate \"delayed\" \n -showUpstreamCurves 1\n -keyMinScale 1\n -stackedCurvesMin -1\n -stackedCurvesMax 1\n -stackedCurvesSpace 0.2\n -preSelectionHighlight 0\n -constrainDrag 0\n -valueLinesToggle 1\n -highlightAffectedCurves 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dopeSheetPanel\" (localizedPanelLabel(\"Dope Sheet\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dope Sheet\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n"
- + " -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 0\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 1\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"0\" \n -showSetMembers 0\n"
- + " -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"DopeSheetEd\");\n dopeSheetEditor -e \n -displayValues 0\n -snapTime \"integer\" \n"
- + " -snapValue \"none\" \n -outliner \"dopeSheetPanel1OutlineEd\" \n -showSummary 1\n -showScene 0\n -hierarchyBelow 0\n -showTicks 1\n -selectionWindow 0 0 0 0 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"timeEditorPanel\" (localizedPanelLabel(\"Time Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Time Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"clipEditorPanel\" (localizedPanelLabel(\"Trax Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Trax Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = clipEditorNameFromPanel($panelName);\n"
- + " clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 0 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"sequenceEditorPanel\" (localizedPanelLabel(\"Camera Sequencer\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Camera Sequencer\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = sequenceEditorNameFromPanel($panelName);\n clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperGraphPanel\" (localizedPanelLabel(\"Hypergraph Hierarchy\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypergraph Hierarchy\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"HyperGraphEd\");\n hyperGraph -e \n -graphLayoutStyle \"hierarchicalLayout\" \n -orientation \"horiz\" \n -mergeConnections 0\n -zoom 1\n -animateTransition 0\n -showRelationships 1\n -showShapes 0\n -showDeformers 0\n -showExpressions 0\n -showConstraints 0\n -showConnectionFromSelected 0\n -showConnectionToSelected 0\n -showConstraintLabels 0\n -showUnderworld 0\n -showInvisible 0\n -transitionFrames 1\n -opaqueContainers 0\n -freeform 0\n -imagePosition 0 0 \n -imageScale 1\n -imageEnabled 0\n -graphType \"DAG\" \n"
- + " -heatMapDisplay 0\n -updateSelection 1\n -updateNodeAdded 1\n -useDrawOverrideColor 0\n -limitGraphTraversal -1\n -range 0 0 \n -iconSize \"smallIcons\" \n -showCachedConnections 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperShadePanel\" (localizedPanelLabel(\"Hypershade\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypershade\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"visorPanel\" (localizedPanelLabel(\"Visor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Visor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n"
- + "\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"nodeEditorPanel\" (localizedPanelLabel(\"Node Editor\")) `;\n\tif ($nodeEditorPanelVisible || $nodeEditorWorkspaceControlOpen) {\n\t\tif (\"\" == $panelName) {\n\t\t\tif ($useSceneConfig) {\n\t\t\t\t$panelName = `scriptedPanel -unParent -type \"nodeEditorPanel\" -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels `;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n -additiveGraphingMode 0\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n"
- + " -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\t}\n\t\t} else {\n\t\t\t$label = `panel -q -label $panelName`;\n\t\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n"
- + " -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n -additiveGraphingMode 0\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\tif (!$useSceneConfig) {\n\t\t\t\tpanel -e -l $label $panelName;\n\t\t\t}\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"createNodePanel\" (localizedPanelLabel(\"Create Node\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Create Node\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"polyTexturePlacementPanel\" (localizedPanelLabel(\"UV Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"UV Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"renderWindowPanel\" (localizedPanelLabel(\"Render View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Render View\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"shapePanel\" (localizedPanelLabel(\"Shape Editor\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tshapePanel -edit -l (localizedPanelLabel(\"Shape Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"posePanel\" (localizedPanelLabel(\"Pose Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tposePanel -edit -l (localizedPanelLabel(\"Pose Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynRelEdPanel\" (localizedPanelLabel(\"Dynamic Relationships\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dynamic Relationships\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"relationshipPanel\" (localizedPanelLabel(\"Relationship Editor\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Relationship Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"referenceEditorPanel\" (localizedPanelLabel(\"Reference Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Reference Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"componentEditorPanel\" (localizedPanelLabel(\"Component Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Component Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynPaintScriptedPanelType\" (localizedPanelLabel(\"Paint Effects\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Paint Effects\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"scriptEditorPanel\" (localizedPanelLabel(\"Script Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Script Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"profilerPanel\" (localizedPanelLabel(\"Profiler Tool\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Profiler Tool\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"contentBrowserPanel\" (localizedPanelLabel(\"Content Browser\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Content Browser\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"Stereo\" (localizedPanelLabel(\"Stereo\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Stereo\")) -mbv $menusOkayInPanels $panelName;\n{ string $editorName = ($panelName+\"Editor\");\n stereoCameraView -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"wireframe\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 1\n"
- + " -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 4 4 \n -bumpResolution 4 4 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n"
- + " -lowQualityLighting 0\n -maximumNumHardwareLights 0\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n"
- + " -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 0\n -height 0\n -sceneRenderFilter 0\n -displayMode \"centerEye\" \n -viewColor 0 0 0 1 \n -useCustomBackground 1\n $editorName;\n stereoCameraView -e -viewSelected 0 $editorName;\n stereoCameraView -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName; };\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\tif ($useSceneConfig) {\n string $configName = `getPanel -cwl (localizedPanelLabel(\"Current Layout\"))`;\n"
- + " if (\"\" != $configName) {\n\t\t\tpanelConfiguration -edit -label (localizedPanelLabel(\"Current Layout\")) \n\t\t\t\t-userCreated false\n\t\t\t\t-defaultImage \"vacantCell.xP:/\"\n\t\t\t\t-image \"\"\n\t\t\t\t-sc false\n\t\t\t\t-configString \"global string $gMainPane; paneLayout -e -cn \\\"single\\\" -ps 1 100 100 $gMainPane;\"\n\t\t\t\t-removeAllPanels\n\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Persp View\")) \n\t\t\t\t\t\"modelPanel\"\n"
- + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 16384\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -greasePencils 1\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 1312\\n -height 732\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName;\\nmodelEditor -e \\n -pluginObjects \\\"gpuCacheDisplayFilter\\\" 1 \\n $editorName\"\n"
- + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 16384\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -greasePencils 1\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 1312\\n -height 732\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName;\\nmodelEditor -e \\n -pluginObjects \\\"gpuCacheDisplayFilter\\\" 1 \\n $editorName\"\n"
+ + " -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 477\n -height 276\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Side View\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Side View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|side\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n"
+ + " -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n"
+ + " -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 476\n -height 276\n -sceneRenderFilter 0\n $editorName;\n"
+ + " modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Front View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Front View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|front\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n"
+ + " -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n"
+ + " -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n"
+ + " -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 477\n -height 276\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Persp View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Persp View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n"
+ + " -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n"
+ + " -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n"
+ + " -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 476\n -height 276\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"ToggledOutliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"ToggledOutliner\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n outlinerEditor -e \n -docTag \"isolOutln_fromSeln\" \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 1\n -showReferenceMembers 1\n"
+ + " -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n"
+ + " -isSet 0\n -isSetMember 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -selectCommand \"print(\\\"\\\")\" \n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n -renderFilterIndex 0\n -selectionOrder \"chronological\" \n -expandAttribute 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"Outliner\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"Outliner\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n outlinerEditor -e \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n"
+ + " -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n"
+ + " $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"graphEditor\" (localizedPanelLabel(\"Graph Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Graph Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 1\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n"
+ + " -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 0\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 1\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 1\n -setFilter \"0\" \n -showSetMembers 0\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n"
+ + " -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 1\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"GraphEd\");\n animCurveEditor -e \n -displayValues 0\n -snapTime \"integer\" \n -snapValue \"none\" \n -showPlayRangeShades \"on\" \n -lockPlayRangeShades \"off\" \n -smoothness \"fine\" \n -resultSamples 1.041667\n -resultScreenSamples 0\n -resultUpdate \"delayed\" \n -showUpstreamCurves 1\n -keyMinScale 1\n -stackedCurvesMin -1\n -stackedCurvesMax 1\n"
+ + " -stackedCurvesSpace 0.2\n -preSelectionHighlight 0\n -constrainDrag 0\n -valueLinesToggle 1\n -highlightAffectedCurves 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dopeSheetPanel\" (localizedPanelLabel(\"Dope Sheet\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dope Sheet\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n"
+ + " -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 0\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 1\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"0\" \n -showSetMembers 0\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n"
+ + " -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"DopeSheetEd\");\n dopeSheetEditor -e \n -displayValues 0\n -snapTime \"integer\" \n -snapValue \"none\" \n -outliner \"dopeSheetPanel1OutlineEd\" \n -showSummary 1\n -showScene 0\n -hierarchyBelow 0\n"
+ + " -showTicks 1\n -selectionWindow 0 0 0 0 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"timeEditorPanel\" (localizedPanelLabel(\"Time Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Time Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"clipEditorPanel\" (localizedPanelLabel(\"Trax Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Trax Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = clipEditorNameFromPanel($panelName);\n clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 0 \n"
+ + " $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"sequenceEditorPanel\" (localizedPanelLabel(\"Camera Sequencer\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Camera Sequencer\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = sequenceEditorNameFromPanel($panelName);\n clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperGraphPanel\" (localizedPanelLabel(\"Hypergraph Hierarchy\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypergraph Hierarchy\")) -mbv $menusOkayInPanels $panelName;\n"
+ + "\n\t\t\t$editorName = ($panelName+\"HyperGraphEd\");\n hyperGraph -e \n -graphLayoutStyle \"hierarchicalLayout\" \n -orientation \"horiz\" \n -mergeConnections 0\n -zoom 1\n -animateTransition 0\n -showRelationships 1\n -showShapes 0\n -showDeformers 0\n -showExpressions 0\n -showConstraints 0\n -showConnectionFromSelected 0\n -showConnectionToSelected 0\n -showConstraintLabels 0\n -showUnderworld 0\n -showInvisible 0\n -transitionFrames 1\n -opaqueContainers 0\n -freeform 0\n -imagePosition 0 0 \n -imageScale 1\n -imageEnabled 0\n -graphType \"DAG\" \n -heatMapDisplay 0\n -updateSelection 1\n -updateNodeAdded 1\n -useDrawOverrideColor 0\n -limitGraphTraversal -1\n"
+ + " -range 0 0 \n -iconSize \"smallIcons\" \n -showCachedConnections 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperShadePanel\" (localizedPanelLabel(\"Hypershade\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypershade\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"visorPanel\" (localizedPanelLabel(\"Visor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Visor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"nodeEditorPanel\" (localizedPanelLabel(\"Node Editor\")) `;\n\tif ($nodeEditorPanelVisible || $nodeEditorWorkspaceControlOpen) {\n"
+ + "\t\tif (\"\" == $panelName) {\n\t\t\tif ($useSceneConfig) {\n\t\t\t\t$panelName = `scriptedPanel -unParent -type \"nodeEditorPanel\" -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels `;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n -additiveGraphingMode 1\n -connectedGraphingMode 1\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n"
+ + " -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -showUnitConversions 0\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\t}\n\t\t} else {\n\t\t\t$label = `panel -q -label $panelName`;\n\t\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n"
+ + " -additiveGraphingMode 1\n -connectedGraphingMode 1\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -showUnitConversions 0\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\tif (!$useSceneConfig) {\n\t\t\t\tpanel -e -l $label $panelName;\n\t\t\t}\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"createNodePanel\" (localizedPanelLabel(\"Create Node\")) `;\n\tif (\"\" != $panelName) {\n"
+ + "\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Create Node\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"polyTexturePlacementPanel\" (localizedPanelLabel(\"UV Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"UV Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"renderWindowPanel\" (localizedPanelLabel(\"Render View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Render View\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"shapePanel\" (localizedPanelLabel(\"Shape Editor\")) `;\n\tif (\"\" != $panelName) {\n"
+ + "\t\t$label = `panel -q -label $panelName`;\n\t\tshapePanel -edit -l (localizedPanelLabel(\"Shape Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"posePanel\" (localizedPanelLabel(\"Pose Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tposePanel -edit -l (localizedPanelLabel(\"Pose Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynRelEdPanel\" (localizedPanelLabel(\"Dynamic Relationships\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dynamic Relationships\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"relationshipPanel\" (localizedPanelLabel(\"Relationship Editor\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Relationship Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"referenceEditorPanel\" (localizedPanelLabel(\"Reference Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Reference Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynPaintScriptedPanelType\" (localizedPanelLabel(\"Paint Effects\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Paint Effects\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"scriptEditorPanel\" (localizedPanelLabel(\"Script Editor\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Script Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"profilerPanel\" (localizedPanelLabel(\"Profiler Tool\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Profiler Tool\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"contentBrowserPanel\" (localizedPanelLabel(\"Content Browser\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Content Browser\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"Stereo\" (localizedPanelLabel(\"Stereo\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Stereo\")) -mbv $menusOkayInPanels $panelName;\n{ string $editorName = ($panelName+\"Editor\");\n stereoCameraView -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"wireframe\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 1\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n"
+ + " -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 4 4 \n -bumpResolution 4 4 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 0\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n"
+ + " -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n"
+ + " -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 0\n -height 0\n -sceneRenderFilter 0\n -displayMode \"centerEye\" \n -viewColor 0 0 0 1 \n -useCustomBackground 1\n $editorName;\n stereoCameraView -e -viewSelected 0 $editorName; };\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\tif ($useSceneConfig) {\n string $configName = `getPanel -cwl (localizedPanelLabel(\"Current Layout\"))`;\n if (\"\" != $configName) {\n\t\t\tpanelConfiguration -edit -label (localizedPanelLabel(\"Current Layout\")) \n\t\t\t\t-userCreated false\n\t\t\t\t-defaultImage \"vacantCell.xP:/\"\n\t\t\t\t-image \"\"\n\t\t\t\t-sc false\n\t\t\t\t-configString \"global string $gMainPane; paneLayout -e -cn \\\"quad\\\" -ps 1 50 50 -ps 2 50 50 -ps 3 50 50 -ps 4 50 50 $gMainPane;\"\n\t\t\t\t-removeAllPanels\n\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Top View\")) \n"
+ + "\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Top View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|top\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Top View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|top\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Persp View\")) \n\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Side View\")) \n\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Side View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|side\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Side View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|side\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Front View\")) \n\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Front View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera front` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Front View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera front` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ "\t\t\t\t$configName;\n\n setNamedPanelLayout (localizedPanelLabel(\"Current Layout\"));\n }\n\n panelHistory -e -clear mainPanelHistory;\n sceneUIReplacement -clear;\n\t}\n\n\ngrid -spacing 5 -size 12 -divisions 5 -displayAxes yes -displayGridLines yes -displayDivisionLines yes -displayPerspectiveLabels no -displayOrthographicLabels no -displayAxesBold yes -perspectiveLabelPosition axis -orthographicLabelPosition edge;\nviewManip -drawCompass 0 -compassAngle 0 -frontParameters \"\" -homeParameters \"\" -selectionLockParameters \"\";\n}\n");
setAttr ".st" 3;
createNode script -n "sceneConfigurationScriptNode";
@@ -273,6 +285,7 @@ createNode aiAOVDriver -s -n "defaultArnoldDisplayDriver";
createNode objectSet -n "workfileMain";
rename -uid "3C9B5D6F-4579-8E3B-5B7D-4C88865A1C68";
addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
+ addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "id" -ln "id" -dt "string";
addAttr -ci true -sn "family" -ln "family" -dt "string";
addAttr -ci true -sn "subset" -ln "subset" -dt "string";
@@ -281,13 +294,14 @@ createNode objectSet -n "workfileMain";
addAttr -ci true -sn "variant" -ln "variant" -dt "string";
addAttr -ci true -sn "asset" -ln "asset" -dt "string";
addAttr -ci true -sn "task" -ln "task" -dt "string";
- addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
- addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
+ addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
+ addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string";
setAttr ".ihi" 0;
setAttr ".hio" yes;
setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:30d256dac64c";
+ setAttr ".instance_id" -type "string" "911dc92a-ad29-41e5-bbf9-733d56174fb9";
setAttr ".id" -type "string" "pyblish.avalon.instance";
setAttr ".family" -type "string" "workfile";
setAttr ".subset" -type "string" "workfileTest_task";
@@ -296,16 +310,9 @@ createNode objectSet -n "workfileMain";
setAttr ".variant" -type "string" "Main";
setAttr ".asset" -type "string" "test_asset";
setAttr ".task" -type "string" "test_task";
- setAttr ".instance_id" -type "string" "911dc92a-ad29-41e5-bbf9-733d56174fb9";
- setAttr ".publish_attributes" -type "string" "{\"ExtractImportReference\": {\"active\": false}}";
+ setAttr ".publish_attributes" -type "string" "{\"ValidateInstanceInContext\": {\"active\": true}, \"ExtractImportReference\": {\"active\": false}}";
+ setAttr ".creator_attributes" -type "string" "{}";
setAttr ".__creator_attributes_keys" -type "string" "";
-createNode objectSet -n "renderingMain";
- rename -uid "8A999C2F-4922-B15D-8D5C-45A16465B69F";
- addAttr -ci true -sn "pre_creator_identifier" -ln "pre_creator_identifier" -dt "string";
- addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
- setAttr ".ihi" 0;
- setAttr ".pre_creator_identifier" -type "string" "io.openpype.creators.maya.renderlayer";
- setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:042447475732";
createNode renderSetupLayer -n "Main";
rename -uid "2202E438-4CEF-F64E-737C-F48C65E31126";
addAttr -ci true -sn "es" -ln "expandedState" -min 0 -max 1 -at "bool";
@@ -320,55 +327,6 @@ createNode collection -n "defaultCollection";
createNode simpleSelector -n "defaultCollectionSelector";
rename -uid "7CA2F6D8-483C-B020-BC03-EF9563A52163";
setAttr ".pat" -type "string" "*";
-createNode objectSet -n "_renderingMain:Main";
- rename -uid "1EEC3A3B-49CF-0C79-5340-39805174FB8A";
- addAttr -s false -ci true -sn "renderlayer" -ln "renderlayer" -at "message";
- addAttr -ci true -sn "id" -ln "id" -dt "string";
- addAttr -ci true -sn "family" -ln "family" -dt "string";
- addAttr -ci true -sn "subset" -ln "subset" -dt "string";
- addAttr -ci true -sn "active" -ln "active" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "creator_identifier" -ln "creator_identifier" -dt "string";
- addAttr -ci true -sn "variant" -ln "variant" -dt "string";
- addAttr -ci true -sn "asset" -ln "asset" -dt "string";
- addAttr -ci true -sn "task" -ln "task" -dt "string";
- addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
- addAttr -ci true -sn "review" -ln "review" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "extendFrames" -ln "extendFrames" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "overrideExistingFrame" -ln "overrideExistingFrame" -min 0
- -max 1 -at "bool";
- addAttr -ci true -sn "tileRendering" -ln "tileRendering" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "tilesX" -ln "tilesX" -at "long";
- addAttr -ci true -sn "tilesY" -ln "tilesY" -at "long";
- addAttr -ci true -sn "convertToScanline" -ln "convertToScanline" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "useReferencedAovs" -ln "useReferencedAovs" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "renderSetupIncludeLights" -ln "renderSetupIncludeLights" -min
- 0 -max 1 -at "bool";
- addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
- addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
- -dt "string";
- addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
- setAttr ".ihi" 0;
- setAttr ".id" -type "string" "pyblish.avalon.instance";
- setAttr ".family" -type "string" "renderlayer";
- setAttr ".subset" -type "string" "renderMain";
- setAttr -cb on ".active" yes;
- setAttr ".creator_identifier" -type "string" "io.openpype.creators.maya.renderlayer";
- setAttr ".variant" -type "string" "Main";
- setAttr ".asset" -type "string" "test_asset";
- setAttr ".task" -type "string" "test_task";
- setAttr ".instance_id" -type "string" "8a9cfb85-9602-4e5e-a4bc-27a2986bae7f";
- setAttr -cb on ".review" yes;
- setAttr -cb on ".extendFrames";
- setAttr -cb on ".overrideExistingFrame" yes;
- setAttr -cb on ".tileRendering";
- setAttr -cb on ".tilesX" 2;
- setAttr -cb on ".tilesY" 2;
- setAttr -cb on ".convertToScanline";
- setAttr -cb on ".useReferencedAovs";
- setAttr -cb on ".renderSetupIncludeLights" yes;
- setAttr ".publish_attributes" -type "string" "{\"CollectDeadlinePools\": {\"primaryPool\": \"\", \"secondaryPool\": \"\"}, \"ValidateDeadlinePools\": {\"active\": true}, \"ValidateFrameRange\": {\"active\": true}, \"ExtractImportReference\": {\"active\": false}, \"MayaSubmitDeadline\": {\"priority\": 50, \"chunkSize\": 1, \"machineList\": \"\", \"whitelist\": false, \"tile_priority\": 50, \"strict_error_checking\": true}, \"ProcessSubmittedJobOnFarm\": {\"publishJobState\": \"Active\"}}";
- setAttr ".__creator_attributes_keys" -type "string" "review,extendFrames,overrideExistingFrame,tileRendering,tilesX,tilesY,convertToScanline,useReferencedAovs,renderSetupIncludeLights";
- setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:69960f336351";
select -ne :time1;
setAttr ".o" 1001;
setAttr ".unw" 1001;
@@ -435,8 +393,6 @@ select -ne :defaultColorMgtGlobals;
select -ne :hardwareRenderGlobals;
setAttr ".ctrs" 256;
setAttr ".btrs" 512;
-select -ne :ikSystem;
- setAttr -s 4 ".sol";
connectAttr "rs_Main.ri" ":persp.rlio[0]";
connectAttr "rs_Main.ri" ":top.rlio[0]";
connectAttr "rs_Main.ri" ":front.rlio[0]";
@@ -459,7 +415,6 @@ connectAttr ":defaultArnoldDisplayDriver.msg" ":defaultArnoldRenderOptions.drive
-na;
connectAttr ":defaultArnoldFilter.msg" ":defaultArnoldRenderOptions.filt";
connectAttr ":defaultArnoldDriver.msg" ":defaultArnoldRenderOptions.drvr";
-connectAttr "_renderingMain:Main.msg" "renderingMain.dnsm" -na;
connectAttr "rs_Main.msg" "Main.lrl";
connectAttr "renderSetup.lit" "Main.pls";
connectAttr "defaultCollection.msg" "Main.cl";
@@ -468,9 +423,8 @@ connectAttr "renderLayerManager.rlmi[1]" "rs_Main.rlid";
connectAttr "defaultCollectionSelector.c" "defaultCollection.sel";
connectAttr "Main.lit" "defaultCollection.pls";
connectAttr "Main.nic" "defaultCollection.pic";
-connectAttr "Main.msg" "_renderingMain:Main.renderlayer";
connectAttr "defaultRenderLayer.msg" ":defaultRenderingList1.r" -na;
connectAttr "rs_Main.msg" ":defaultRenderingList1.r" -na;
connectAttr "pSphere1_GEOShape1.iog" ":initialShadingGroup.dsm" -na;
connectAttr "pDiscShape1.iog" ":initialShadingGroup.dsm" -na;
-// End of test_project_test_asset_test_task_v001.ma
+// End of test_project_test_asset_test_task_v002.ma
diff --git a/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/work/test_task/renders/maya/test_project_test_asset_workfileTest_task_v001/Main/renderMain_metadata.json b/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/work/test_task/renders/maya/test_project_test_asset_workfileTest_task_v001/Main/renderMain_metadata.json
deleted file mode 100644
index 8c9e4de21a..0000000000
--- a/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/work/test_task/renders/maya/test_project_test_asset_workfileTest_task_v001/Main/renderMain_metadata.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{
- "asset": "test_asset",
- "comment": "",
- "deadline_publish_job_id": "6540ba7fc27eabc1c1a3d387",
- "fps": 25.0,
- "frameEnd": 1001,
- "frameStart": 1001,
- "instances": [
- {
- "asset": "test_asset",
- "colorspace": null,
- "comment": "",
- "deadlineUrl": "http://127.0.0.1:8082",
- "extendFrames": false,
- "families": [
- "render",
- "review",
- "ftrack"
- ],
- "family": "render",
- "fps": 25.0,
- "frameEnd": 1001,
- "frameEndHandle": 1001,
- "frameStart": 1001,
- "frameStartHandle": 1001,
- "handleEnd": 0,
- "handleStart": 0,
- "inputVersions": [],
- "jobBatchName": "",
- "multipartExr": true,
- "overrideExistingFrame": false,
- "pixelAspect": 1.0,
- "representations": [
- {
- "colorspaceData": {
- "colorspace": "scene-linear Rec 709/sRGB",
- "config": {
- "path": "C:/Program Files/Autodesk/Maya2024/resources/OCIO-configs/Maya-legacy/config.ocio",
- "template": "C:/Program Files/Autodesk/Maya2024/resources/OCIO-configs/Maya-legacy/config.ocio"
- },
- "display": "legacy",
- "view": "sRGB gamma"
- },
- "ext": "exr",
- "files": "Main.1001.exr",
- "fps": 25.0,
- "frameEnd": 1001,
- "frameStart": 1001,
- "name": "exr",
- "stagingDir": "{root[work]}/test_project/test_asset/work/test_task/renders/maya/test_project_test_asset_workfileTest_task_v001/Main",
- "tags": [
- "review"
- ]
- }
- ],
- "resolutionHeight": 1080,
- "resolutionWidth": 1920,
- "review": true,
- "source": "{root[work]}/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v001.ma",
- "stagingDir_persistent": false,
- "subset": "renderMain_beauty",
- "subsetGroup": "renderMain",
- "useSequenceForReview": true
- }
- ],
- "intent": null,
- "job": {
- "Aux": [],
- "Bad": [],
- "ComFra": 0,
- "CompletedChunks": 0,
- "ConcurrencyToken": null,
- "DataSize": -1,
- "Date": "2023-10-31T08:27:42.9465949+00:00",
- "DateComp": "0001-01-01T00:00:00Z",
- "DateStart": "0001-01-01T00:00:00Z",
- "Errs": 0,
- "ExtraElements": null,
- "FailedChunks": 0,
- "IsSub": false,
- "Mach": "DESKTOP-969549J",
- "Main": false,
- "MainEnd": 0,
- "MainStart": 0,
- "OutDir": [
- "C:/Users/TOKEJE~1/AppData/Local/Temp/tmpcjp1zvgv/output/test_project/test_asset/work/test_task/renders/maya/test_project_test_asset_workfileTest_task_v001/Main"
- ],
- "OutFile": [
- "Main.1001.exr"
- ],
- "PendingChunks": 0,
- "Plug": "MayaBatch",
- "Props": {
- "AWSPortalAssetFileWhitelist": [],
- "AWSPortalAssets": [],
- "AutoTime": false,
- "AuxSync": false,
- "Batch": "test_project_test_asset_test_task_v001.ma31102023082742",
- "Chunk": 1,
- "Cmmt": "",
- "Conc": 1,
- "ConcLimt": true,
- "Dep": [],
- "DepComp": true,
- "DepDel": false,
- "DepFail": false,
- "DepFrame": false,
- "DepFrameEnd": 0,
- "DepFrameStart": 0,
- "DepPer": -1.0,
- "Dept": "",
- "Env": {
- "AVALON_APP_NAME": "maya/2024",
- "AVALON_ASSET": "test_asset",
- "AVALON_PROJECT": "test_project",
- "AVALON_TASK": "test_task",
- "FTRACK_SERVER": "https://pype.ftrackapp.com",
- "OPENPYPE_LOG_NO_COLORS": "1",
- "OPENPYPE_MONGO": "mongodb://localhost:2707/",
- "OPENPYPE_RENDER_JOB": "1"
- },
- "EnvOnly": false,
- "EventDir": "",
- "EventOI": [],
- "Ex0": "",
- "Ex1": "",
- "Ex2": "",
- "Ex3": "",
- "Ex4": "",
- "Ex5": "",
- "Ex6": "",
- "Ex7": "",
- "Ex8": "",
- "Ex9": "",
- "ExDic": {},
- "FrameTimeout": false,
- "Frames": "1001",
- "FriStart": "-10675199.02:48:05.4775808",
- "FriStop": "-10675199.02:48:05.4775808",
- "Grp": "none",
- "InitializePluginTime": 0,
- "Int": false,
- "IntPer": 100,
- "JobFailErr": 0,
- "JobFailOvr": false,
- "Limits": [],
- "ListedSlaves": [],
- "MachLmt": 0,
- "MachLmtProg": -1.0,
- "MaxTime": 0,
- "MinTime": 0,
- "MonStart": "-10675199.02:48:05.4775808",
- "MonStop": "-10675199.02:48:05.4775808",
- "Name": "test_project_test_asset_test_task_v001.ma31102023082742 - renderMain",
- "NoBad": false,
- "NoEvnt": false,
- "NotEmail": [],
- "NotNote": "",
- "NotOvr": false,
- "NotUser": [
- "tokejepsen"
- ],
- "OnComp": 2,
- "OptIns": {},
- "OverAutoClean": false,
- "OverClean": false,
- "OverCleanDays": 0,
- "OverCleanType": 1,
- "OvrTaskEINames": false,
- "PathMap": [],
- "PlugDir": "",
- "PlugInfo": {
- "OutputFilePath": "C:/Users/TOKEJE~1/AppData/Local/Temp/tmpcjp1zvgv/output/test_project/test_asset/work/test_task/renders/maya",
- "OutputFilePrefix": "//",
- "ProjectPath": "C:\\Users\\TOKEJE~1\\AppData\\Local\\Temp\\tmpcjp1zvgv\\output\\test_project\\test_asset\\work\\test_task",
- "RenderLayer": "rs_Main",
- "RenderSetupIncludeLights": "True",
- "Renderer": "arnold",
- "SceneFile": "C:\\Users\\TOKEJE~1\\AppData\\Local\\Temp\\tmpcjp1zvgv\\output\\test_project\\test_asset\\publish\\workfile\\workfileTest_task\\v001\\test_project_test_asset_workfileTest_task_v001.ma",
- "StrictErrorChecking": "True",
- "UsingRenderLayers": "True",
- "Version": "2024"
- },
- "PoJobScrp": "",
- "PoTskScrp": "",
- "Pool": "none",
- "PrJobScrp": "",
- "PrTskScrp": "",
- "Pri": 50,
- "Protect": false,
- "Region": "",
- "Reload": false,
- "RemTmT": 0,
- "ReqAss": [
- {
- "EndOffset": 0,
- "FileName": "C:\\Users\\TOKEJE~1\\AppData\\Local\\Temp\\tmpcjp1zvgv\\output\\test_project\\test_asset\\publish\\workfile\\workfileTest_task\\v001\\test_project_test_asset_workfileTest_task_v001.ma",
- "FrameString": "",
- "IgnoreFrameOffsets": false,
- "IsFrameAware": false,
- "Notes": "",
- "OverrideFrameOffsets": false,
- "StartOffset": 0
- }
- ],
- "SatStart": "-10675199.02:48:05.4775808",
- "SatStop": "-10675199.02:48:05.4775808",
- "Schd": 0,
- "SchdDate": "2023-10-31T08:27:42.9465593+00:00",
- "SchdDays": 1,
- "SchdStop": "0001-01-01T00:00:00Z",
- "ScrDep": [],
- "SecPool": "none",
- "Seq": false,
- "SndEmail": false,
- "SndPopup": false,
- "SndWarn": true,
- "StartTime": 0,
- "SunStart": "-10675199.02:48:05.4775808",
- "SunStop": "-10675199.02:48:05.4775808",
- "TaskEx0": "",
- "TaskEx1": "",
- "TaskEx2": "",
- "TaskEx3": "",
- "TaskEx4": "",
- "TaskEx5": "",
- "TaskEx6": "",
- "TaskEx7": "",
- "TaskEx8": "",
- "TaskEx9": "",
- "Tasks": 1,
- "ThuStart": "-10675199.02:48:05.4775808",
- "ThuStop": "-10675199.02:48:05.4775808",
- "TimeScrpt": false,
- "Timeout": 1,
- "TskFailErr": 0,
- "TskFailOvr": false,
- "TueStart": "-10675199.02:48:05.4775808",
- "TueStop": "-10675199.02:48:05.4775808",
- "User": "tokejepsen",
- "WedStart": "-10675199.02:48:05.4775808",
- "WedStop": "-10675199.02:48:05.4775808",
- "White": false
- },
- "Purged": false,
- "QueuedChunks": 0,
- "RenderingChunks": 0,
- "SnglTskPrg": "0 %",
- "Stat": 6,
- "SuspendedChunks": 0,
- "Tile": false,
- "TileCount": 0,
- "TileFile": [],
- "TileFrame": 0,
- "TileX": 0,
- "TileY": 0,
- "_id": "6540ba7ec27eabc1c1a3d386"
- },
- "session": {
- "AVALON_APP": "maya",
- "AVALON_ASSET": "test_asset",
- "AVALON_DB": "avalon_tests",
- "AVALON_LABEL": "OpenPype",
- "AVALON_PROJECT": "test_project",
- "AVALON_PROJECTS": "",
- "AVALON_SCENEDIR": "",
- "AVALON_TASK": "test_task",
- "AVALON_TIMEOUT": "3000",
- "AVALON_WORKDIR": "C:\\Users\\TOKEJE~1\\AppData\\Local\\Temp\\tmpcjp1zvgv\\output\\test_project\\test_asset\\work\\test_task",
- "schema": "openpype:session-3.0"
- },
- "source": "{root[work]}/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v001.ma",
- "user": "tokejepsen",
- "version": 1
-}
diff --git a/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v001.ma b/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v001.ma
index e438d80d5f..2cc87c2f48 100644
--- a/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v001.ma
+++ b/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v001.ma
@@ -1,22 +1,22 @@
-//Maya ASCII 2022 scene
-//Name: test_project_test_asset_test_task_v001.ma
-//Last modified: Thu, Sep 14, 2023 06:31:00 PM
+//Maya ASCII 2023 scene
+//Name: test_project_test_asset_test_task_v002.ma
+//Last modified: Thu, Dec 07, 2023 03:53:06 PM
//Codeset: 1252
-requires maya "2022";
-requires -nodeType "polyDisc" "modelingToolkit" "0.0.0.0";
-requires "stereoCamera" "10.0";
-requires -nodeType "aiOptions" -nodeType "aiAOVDriver" -nodeType "aiAOVFilter" "mtoa" "5.2.2.1";
+requires maya "2023";
requires -nodeType "simpleSelector" -nodeType "renderSetupLayer" -nodeType "renderSetup"
-nodeType "collection" "renderSetup.py" "1.0";
requires "stereoCamera" "10.0";
+requires -nodeType "aiOptions" -nodeType "aiAOVDriver" -nodeType "aiAOVFilter" "mtoa" "5.2.1.1";
+requires -nodeType "polyDisc" "modelingToolkit" "0.0.0.0";
+requires "stereoCamera" "10.0";
currentUnit -l centimeter -a degree -t pal;
fileInfo "application" "maya";
-fileInfo "product" "Maya 2022";
-fileInfo "version" "2022";
-fileInfo "cutIdentifier" "202205171752-c25c06f306";
-fileInfo "osv" "Windows 10 Pro v2009 (Build: 19044)";
+fileInfo "product" "Maya 2023";
+fileInfo "version" "2023";
+fileInfo "cutIdentifier" "202211021031-847a9f9623";
+fileInfo "osv" "Windows 10 Pro v2009 (Build: 19045)";
fileInfo "license" "education";
-fileInfo "UUID" "019C7F50-40EF-1435-E27F-729F64685E67";
+fileInfo "UUID" "7A992745-4AD5-777F-5575-B4BFAC62B1D0";
fileInfo "OpenPypeContext" "eyJwdWJsaXNoX2F0dHJpYnV0ZXMiOiB7IlZhbGlkYXRlQ29udGFpbmVycyI6IHsiYWN0aXZlIjogdHJ1ZX19fQ==";
createNode transform -s -n "persp";
rename -uid "D52C935B-47C9-D868-A875-D799DD17B3A1";
@@ -142,19 +142,20 @@ createNode camera -n "perspShape1" -p "persp1";
setAttr ".hc" -type "string" "viewSet -p %camera";
setAttr ".dr" yes;
createNode lightLinker -s -n "lightLinker1";
- rename -uid "6B9ADCD4-41B9-5BCC-826D-4A874A278510";
+ rename -uid "09465BD3-42E5-18E4-7906-20A99BB2A6C0";
setAttr -s 2 ".lnk";
setAttr -s 2 ".slnk";
createNode shapeEditorManager -n "shapeEditorManager";
- rename -uid "5B4518C5-46C9-6921-690E-EFAF77B21A36";
+ rename -uid "9F2E8009-4D69-046B-FCC4-28A8CE8F86DB";
createNode poseInterpolatorManager -n "poseInterpolatorManager";
- rename -uid "8518F293-4F06-BFF2-647A-72A099FBF025";
+ rename -uid "6757AD81-40B0-A747-69C3-D9A56259571E";
createNode displayLayerManager -n "layerManager";
- rename -uid "04D880D5-4D86-0C58-CA3D-208ABE3E1E16";
+ rename -uid "6F055ED5-4D91-8F85-7951-B4A13543A561";
createNode displayLayer -n "defaultLayer";
rename -uid "4A776D1B-401F-7069-1C74-A7AAE84CEE03";
+ setAttr ".ufem" -type "stringArray" 0 ;
createNode renderLayerManager -n "renderLayerManager";
- rename -uid "B719B8BE-46BF-12E6-BEBA-B0AD4DBDBA87";
+ rename -uid "55626D2B-4FD5-61A1-7AB2-47B13F19D8AA";
setAttr -s 2 ".rlmi[1]" 1;
setAttr -s 2 ".rlmi";
createNode renderLayer -n "defaultRenderLayer";
@@ -167,6 +168,7 @@ createNode polySphere -n "polySphere1";
createNode objectSet -n "modelMain";
rename -uid "A76AD4F8-4CF5-AA0D-4E98-BABEE6454CC3";
addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
+ addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "id" -ln "id" -dt "string";
addAttr -ci true -sn "family" -ln "family" -dt "string";
addAttr -ci true -sn "subset" -ln "subset" -dt "string";
@@ -175,18 +177,19 @@ createNode objectSet -n "modelMain";
addAttr -ci true -sn "variant" -ln "variant" -dt "string";
addAttr -ci true -sn "asset" -ln "asset" -dt "string";
addAttr -ci true -sn "task" -ln "task" -dt "string";
- addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "writeColorSets" -ln "writeColorSets" -min 0 -max 1 -at "bool";
addAttr -ci true -sn "writeFaceSets" -ln "writeFaceSets" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "includeParentHierarchy" -ln "includeParentHierarchy" -min
+ addAttr -ci true -sn "includeParentHierarchy" -ln "includeParentHierarchy" -min
0 -max 1 -at "bool";
addAttr -ci true -sn "attr" -ln "attr" -dt "string";
addAttr -ci true -sn "attrPrefix" -ln "attrPrefix" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
- addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
+ addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
+ addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string";
setAttr ".ihi" 0;
setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:7364ea6776c9";
+ setAttr ".instance_id" -type "string" "6889d3db-b813-43db-96de-9ba555dc4472";
setAttr ".id" -type "string" "pyblish.avalon.instance";
setAttr ".family" -type "string" "model";
setAttr ".subset" -type "string" "modelMain";
@@ -195,59 +198,68 @@ createNode objectSet -n "modelMain";
setAttr ".variant" -type "string" "Main";
setAttr ".asset" -type "string" "test_asset";
setAttr ".task" -type "string" "test_task";
- setAttr ".instance_id" -type "string" "6889d3db-b813-43db-96de-9ba555dc4472";
setAttr -cb on ".writeColorSets";
setAttr -cb on ".writeFaceSets";
setAttr -cb on ".includeParentHierarchy";
setAttr ".attr" -type "string" "";
setAttr ".attrPrefix" -type "string" "";
- setAttr ".publish_attributes" -type "string" "{\"ValidateNodeIDsRelated\": {\"active\": true}, \"ValidateTransformNamingSuffix\": {\"active\": true}, \"ValidateColorSets\": {\"active\": true}, \"ValidateMeshArnoldAttributes\": {\"active\": true}, \"ValidateMeshHasUVs\": {\"active\": true}, \"ValidateMeshNonZeroEdgeLength\": {\"active\": true}, \"ExtractModel\": {\"active\": true}}";
+ setAttr ".publish_attributes" -type "string" "{\"ValidateNodeIDsRelated\": {\"active\": true}, \"ValidateInstanceInContext\": {\"active\": true}, \"ValidateTransformNamingSuffix\": {\"active\": true}, \"ValidateColorSets\": {\"active\": true}, \"ValidateMeshHasUVs\": {\"active\": true}, \"ValidateMeshNonZeroEdgeLength\": {\"active\": true}, \"ExtractModel\": {\"active\": true}, \"ValidateMeshArnoldAttributes\": {\"active\": true}}";
+ setAttr ".creator_attributes" -type "string" "{}";
setAttr ".__creator_attributes_keys" -type "string" "writeColorSets,writeFaceSets,includeParentHierarchy,attr,attrPrefix";
createNode script -n "uiConfigurationScriptNode";
rename -uid "4B7AFB53-452E-E870-63E1-CCA1DD6EAF13";
setAttr ".b" -type "string" (
"// Maya Mel UI Configuration File.\n//\n// This script is machine generated. Edit at your own risk.\n//\n//\n\nglobal string $gMainPane;\nif (`paneLayout -exists $gMainPane`) {\n\n\tglobal int $gUseScenePanelConfig;\n\tint $useSceneConfig = $gUseScenePanelConfig;\n\tint $nodeEditorPanelVisible = stringArrayContains(\"nodeEditorPanel1\", `getPanel -vis`);\n\tint $nodeEditorWorkspaceControlOpen = (`workspaceControl -exists nodeEditorPanel1Window` && `workspaceControl -q -visible nodeEditorPanel1Window`);\n\tint $menusOkayInPanels = `optionVar -q allowMenusInPanels`;\n\tint $nVisPanes = `paneLayout -q -nvp $gMainPane`;\n\tint $nPanes = 0;\n\tstring $editorName;\n\tstring $panelName;\n\tstring $itemFilterName;\n\tstring $panelConfig;\n\n\t//\n\t// get current state of the UI\n\t//\n\tsceneUIReplacement -update $gMainPane;\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Top View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Top View\")) -mbv $menusOkayInPanels $panelName;\n"
- + "\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|top\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n"
+ + "\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|top\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n"
+ " -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n"
- + " -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 1\n -height 1\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n"
- + "\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Side View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Side View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|side\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n"
- + " -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n"
- + " -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 1\n -height 1\n"
- + " -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Front View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Front View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|front\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n"
- + " -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n"
- + " -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n"
- + " -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 1\n -height 1\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Persp View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Persp View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n"
- + " -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n"
- + " -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n"
- + " -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 1312\n -height 732\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"ToggledOutliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"ToggledOutliner\")) -mbv $menusOkayInPanels $panelName;\n"
- + "\t\t$editorName = $panelName;\n outlinerEditor -e \n -docTag \"isolOutln_fromSeln\" \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 1\n -showReferenceMembers 1\n -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n"
- + " -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -isSet 0\n -isSetMember 0\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -selectCommand \"print(\\\"\\\")\" \n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 1\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n -renderFilterIndex 0\n"
- + " -selectionOrder \"chronological\" \n -expandAttribute 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"Outliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"Outliner\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n outlinerEditor -e \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n"
- + " -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n"
- + " -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"graphEditor\" (localizedPanelLabel(\"Graph Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Graph Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n"
- + " -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 1\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 0\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 1\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 1\n -setFilter \"0\" \n -showSetMembers 0\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -displayMode \"DAG\" \n -expandObjects 0\n"
- + " -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 1\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"GraphEd\");\n animCurveEditor -e \n -displayValues 0\n -snapTime \"integer\" \n -snapValue \"none\" \n -showPlayRangeShades \"on\" \n -lockPlayRangeShades \"off\" \n -smoothness \"fine\" \n -resultSamples 1.041667\n"
- + " -resultScreenSamples 0\n -resultUpdate \"delayed\" \n -showUpstreamCurves 1\n -keyMinScale 1\n -stackedCurvesMin -1\n -stackedCurvesMax 1\n -stackedCurvesSpace 0.2\n -preSelectionHighlight 0\n -constrainDrag 0\n -valueLinesToggle 1\n -highlightAffectedCurves 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dopeSheetPanel\" (localizedPanelLabel(\"Dope Sheet\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dope Sheet\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n"
- + " -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 0\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 1\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"0\" \n -showSetMembers 0\n"
- + " -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"DopeSheetEd\");\n dopeSheetEditor -e \n -displayValues 0\n -snapTime \"integer\" \n"
- + " -snapValue \"none\" \n -outliner \"dopeSheetPanel1OutlineEd\" \n -showSummary 1\n -showScene 0\n -hierarchyBelow 0\n -showTicks 1\n -selectionWindow 0 0 0 0 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"timeEditorPanel\" (localizedPanelLabel(\"Time Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Time Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"clipEditorPanel\" (localizedPanelLabel(\"Trax Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Trax Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = clipEditorNameFromPanel($panelName);\n"
- + " clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 0 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"sequenceEditorPanel\" (localizedPanelLabel(\"Camera Sequencer\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Camera Sequencer\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = sequenceEditorNameFromPanel($panelName);\n clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperGraphPanel\" (localizedPanelLabel(\"Hypergraph Hierarchy\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypergraph Hierarchy\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"HyperGraphEd\");\n hyperGraph -e \n -graphLayoutStyle \"hierarchicalLayout\" \n -orientation \"horiz\" \n -mergeConnections 0\n -zoom 1\n -animateTransition 0\n -showRelationships 1\n -showShapes 0\n -showDeformers 0\n -showExpressions 0\n -showConstraints 0\n -showConnectionFromSelected 0\n -showConnectionToSelected 0\n -showConstraintLabels 0\n -showUnderworld 0\n -showInvisible 0\n -transitionFrames 1\n -opaqueContainers 0\n -freeform 0\n -imagePosition 0 0 \n -imageScale 1\n -imageEnabled 0\n -graphType \"DAG\" \n"
- + " -heatMapDisplay 0\n -updateSelection 1\n -updateNodeAdded 1\n -useDrawOverrideColor 0\n -limitGraphTraversal -1\n -range 0 0 \n -iconSize \"smallIcons\" \n -showCachedConnections 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperShadePanel\" (localizedPanelLabel(\"Hypershade\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypershade\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"visorPanel\" (localizedPanelLabel(\"Visor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Visor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n"
- + "\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"nodeEditorPanel\" (localizedPanelLabel(\"Node Editor\")) `;\n\tif ($nodeEditorPanelVisible || $nodeEditorWorkspaceControlOpen) {\n\t\tif (\"\" == $panelName) {\n\t\t\tif ($useSceneConfig) {\n\t\t\t\t$panelName = `scriptedPanel -unParent -type \"nodeEditorPanel\" -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels `;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n -additiveGraphingMode 0\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n"
- + " -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\t}\n\t\t} else {\n\t\t\t$label = `panel -q -label $panelName`;\n\t\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n"
- + " -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n -additiveGraphingMode 0\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\tif (!$useSceneConfig) {\n\t\t\t\tpanel -e -l $label $panelName;\n\t\t\t}\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"createNodePanel\" (localizedPanelLabel(\"Create Node\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Create Node\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"polyTexturePlacementPanel\" (localizedPanelLabel(\"UV Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"UV Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"renderWindowPanel\" (localizedPanelLabel(\"Render View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Render View\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"shapePanel\" (localizedPanelLabel(\"Shape Editor\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tshapePanel -edit -l (localizedPanelLabel(\"Shape Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"posePanel\" (localizedPanelLabel(\"Pose Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tposePanel -edit -l (localizedPanelLabel(\"Pose Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynRelEdPanel\" (localizedPanelLabel(\"Dynamic Relationships\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dynamic Relationships\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"relationshipPanel\" (localizedPanelLabel(\"Relationship Editor\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Relationship Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"referenceEditorPanel\" (localizedPanelLabel(\"Reference Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Reference Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"componentEditorPanel\" (localizedPanelLabel(\"Component Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Component Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynPaintScriptedPanelType\" (localizedPanelLabel(\"Paint Effects\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Paint Effects\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"scriptEditorPanel\" (localizedPanelLabel(\"Script Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Script Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"profilerPanel\" (localizedPanelLabel(\"Profiler Tool\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Profiler Tool\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"contentBrowserPanel\" (localizedPanelLabel(\"Content Browser\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Content Browser\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"Stereo\" (localizedPanelLabel(\"Stereo\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Stereo\")) -mbv $menusOkayInPanels $panelName;\n{ string $editorName = ($panelName+\"Editor\");\n stereoCameraView -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"wireframe\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 1\n"
- + " -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 4 4 \n -bumpResolution 4 4 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n"
- + " -lowQualityLighting 0\n -maximumNumHardwareLights 0\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n"
- + " -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 0\n -height 0\n -sceneRenderFilter 0\n -displayMode \"centerEye\" \n -viewColor 0 0 0 1 \n -useCustomBackground 1\n $editorName;\n stereoCameraView -e -viewSelected 0 $editorName;\n stereoCameraView -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName; };\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\tif ($useSceneConfig) {\n string $configName = `getPanel -cwl (localizedPanelLabel(\"Current Layout\"))`;\n"
- + " if (\"\" != $configName) {\n\t\t\tpanelConfiguration -edit -label (localizedPanelLabel(\"Current Layout\")) \n\t\t\t\t-userCreated false\n\t\t\t\t-defaultImage \"vacantCell.xP:/\"\n\t\t\t\t-image \"\"\n\t\t\t\t-sc false\n\t\t\t\t-configString \"global string $gMainPane; paneLayout -e -cn \\\"single\\\" -ps 1 100 100 $gMainPane;\"\n\t\t\t\t-removeAllPanels\n\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Persp View\")) \n\t\t\t\t\t\"modelPanel\"\n"
- + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 16384\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -greasePencils 1\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 1312\\n -height 732\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName;\\nmodelEditor -e \\n -pluginObjects \\\"gpuCacheDisplayFilter\\\" 1 \\n $editorName\"\n"
- + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 16384\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -greasePencils 1\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 1312\\n -height 732\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName;\\nmodelEditor -e \\n -pluginObjects \\\"gpuCacheDisplayFilter\\\" 1 \\n $editorName\"\n"
+ + " -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 477\n -height 276\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Side View\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Side View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|side\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n"
+ + " -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n"
+ + " -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 476\n -height 276\n -sceneRenderFilter 0\n $editorName;\n"
+ + " modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Front View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Front View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|front\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n"
+ + " -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n"
+ + " -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n"
+ + " -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 477\n -height 276\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Persp View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Persp View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n"
+ + " -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n"
+ + " -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n"
+ + " -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 476\n -height 276\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"ToggledOutliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"ToggledOutliner\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n outlinerEditor -e \n -docTag \"isolOutln_fromSeln\" \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 1\n -showReferenceMembers 1\n"
+ + " -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n"
+ + " -isSet 0\n -isSetMember 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -selectCommand \"print(\\\"\\\")\" \n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n -renderFilterIndex 0\n -selectionOrder \"chronological\" \n -expandAttribute 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"Outliner\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"Outliner\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n outlinerEditor -e \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n"
+ + " -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n"
+ + " $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"graphEditor\" (localizedPanelLabel(\"Graph Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Graph Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 1\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n"
+ + " -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 0\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 1\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 1\n -setFilter \"0\" \n -showSetMembers 0\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n"
+ + " -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 1\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"GraphEd\");\n animCurveEditor -e \n -displayValues 0\n -snapTime \"integer\" \n -snapValue \"none\" \n -showPlayRangeShades \"on\" \n -lockPlayRangeShades \"off\" \n -smoothness \"fine\" \n -resultSamples 1.041667\n -resultScreenSamples 0\n -resultUpdate \"delayed\" \n -showUpstreamCurves 1\n -keyMinScale 1\n -stackedCurvesMin -1\n -stackedCurvesMax 1\n"
+ + " -stackedCurvesSpace 0.2\n -preSelectionHighlight 0\n -constrainDrag 0\n -valueLinesToggle 1\n -highlightAffectedCurves 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dopeSheetPanel\" (localizedPanelLabel(\"Dope Sheet\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dope Sheet\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n"
+ + " -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 0\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 1\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"0\" \n -showSetMembers 0\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n"
+ + " -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"DopeSheetEd\");\n dopeSheetEditor -e \n -displayValues 0\n -snapTime \"integer\" \n -snapValue \"none\" \n -outliner \"dopeSheetPanel1OutlineEd\" \n -showSummary 1\n -showScene 0\n -hierarchyBelow 0\n"
+ + " -showTicks 1\n -selectionWindow 0 0 0 0 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"timeEditorPanel\" (localizedPanelLabel(\"Time Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Time Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"clipEditorPanel\" (localizedPanelLabel(\"Trax Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Trax Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = clipEditorNameFromPanel($panelName);\n clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 0 \n"
+ + " $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"sequenceEditorPanel\" (localizedPanelLabel(\"Camera Sequencer\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Camera Sequencer\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = sequenceEditorNameFromPanel($panelName);\n clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperGraphPanel\" (localizedPanelLabel(\"Hypergraph Hierarchy\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypergraph Hierarchy\")) -mbv $menusOkayInPanels $panelName;\n"
+ + "\n\t\t\t$editorName = ($panelName+\"HyperGraphEd\");\n hyperGraph -e \n -graphLayoutStyle \"hierarchicalLayout\" \n -orientation \"horiz\" \n -mergeConnections 0\n -zoom 1\n -animateTransition 0\n -showRelationships 1\n -showShapes 0\n -showDeformers 0\n -showExpressions 0\n -showConstraints 0\n -showConnectionFromSelected 0\n -showConnectionToSelected 0\n -showConstraintLabels 0\n -showUnderworld 0\n -showInvisible 0\n -transitionFrames 1\n -opaqueContainers 0\n -freeform 0\n -imagePosition 0 0 \n -imageScale 1\n -imageEnabled 0\n -graphType \"DAG\" \n -heatMapDisplay 0\n -updateSelection 1\n -updateNodeAdded 1\n -useDrawOverrideColor 0\n -limitGraphTraversal -1\n"
+ + " -range 0 0 \n -iconSize \"smallIcons\" \n -showCachedConnections 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperShadePanel\" (localizedPanelLabel(\"Hypershade\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypershade\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"visorPanel\" (localizedPanelLabel(\"Visor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Visor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"nodeEditorPanel\" (localizedPanelLabel(\"Node Editor\")) `;\n\tif ($nodeEditorPanelVisible || $nodeEditorWorkspaceControlOpen) {\n"
+ + "\t\tif (\"\" == $panelName) {\n\t\t\tif ($useSceneConfig) {\n\t\t\t\t$panelName = `scriptedPanel -unParent -type \"nodeEditorPanel\" -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels `;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n -additiveGraphingMode 1\n -connectedGraphingMode 1\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n"
+ + " -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -showUnitConversions 0\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\t}\n\t\t} else {\n\t\t\t$label = `panel -q -label $panelName`;\n\t\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n"
+ + " -additiveGraphingMode 1\n -connectedGraphingMode 1\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -showUnitConversions 0\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\tif (!$useSceneConfig) {\n\t\t\t\tpanel -e -l $label $panelName;\n\t\t\t}\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"createNodePanel\" (localizedPanelLabel(\"Create Node\")) `;\n\tif (\"\" != $panelName) {\n"
+ + "\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Create Node\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"polyTexturePlacementPanel\" (localizedPanelLabel(\"UV Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"UV Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"renderWindowPanel\" (localizedPanelLabel(\"Render View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Render View\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"shapePanel\" (localizedPanelLabel(\"Shape Editor\")) `;\n\tif (\"\" != $panelName) {\n"
+ + "\t\t$label = `panel -q -label $panelName`;\n\t\tshapePanel -edit -l (localizedPanelLabel(\"Shape Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"posePanel\" (localizedPanelLabel(\"Pose Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tposePanel -edit -l (localizedPanelLabel(\"Pose Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynRelEdPanel\" (localizedPanelLabel(\"Dynamic Relationships\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dynamic Relationships\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"relationshipPanel\" (localizedPanelLabel(\"Relationship Editor\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Relationship Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"referenceEditorPanel\" (localizedPanelLabel(\"Reference Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Reference Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynPaintScriptedPanelType\" (localizedPanelLabel(\"Paint Effects\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Paint Effects\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"scriptEditorPanel\" (localizedPanelLabel(\"Script Editor\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Script Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"profilerPanel\" (localizedPanelLabel(\"Profiler Tool\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Profiler Tool\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"contentBrowserPanel\" (localizedPanelLabel(\"Content Browser\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Content Browser\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"Stereo\" (localizedPanelLabel(\"Stereo\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Stereo\")) -mbv $menusOkayInPanels $panelName;\n{ string $editorName = ($panelName+\"Editor\");\n stereoCameraView -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"wireframe\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 1\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n"
+ + " -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 4 4 \n -bumpResolution 4 4 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 0\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n"
+ + " -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n"
+ + " -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 0\n -height 0\n -sceneRenderFilter 0\n -displayMode \"centerEye\" \n -viewColor 0 0 0 1 \n -useCustomBackground 1\n $editorName;\n stereoCameraView -e -viewSelected 0 $editorName; };\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\tif ($useSceneConfig) {\n string $configName = `getPanel -cwl (localizedPanelLabel(\"Current Layout\"))`;\n if (\"\" != $configName) {\n\t\t\tpanelConfiguration -edit -label (localizedPanelLabel(\"Current Layout\")) \n\t\t\t\t-userCreated false\n\t\t\t\t-defaultImage \"vacantCell.xP:/\"\n\t\t\t\t-image \"\"\n\t\t\t\t-sc false\n\t\t\t\t-configString \"global string $gMainPane; paneLayout -e -cn \\\"quad\\\" -ps 1 50 50 -ps 2 50 50 -ps 3 50 50 -ps 4 50 50 $gMainPane;\"\n\t\t\t\t-removeAllPanels\n\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Top View\")) \n"
+ + "\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Top View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|top\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Top View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|top\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Persp View\")) \n\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Side View\")) \n\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Side View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|side\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Side View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|side\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Front View\")) \n\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Front View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera front` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Front View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera front` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ "\t\t\t\t$configName;\n\n setNamedPanelLayout (localizedPanelLabel(\"Current Layout\"));\n }\n\n panelHistory -e -clear mainPanelHistory;\n sceneUIReplacement -clear;\n\t}\n\n\ngrid -spacing 5 -size 12 -divisions 5 -displayAxes yes -displayGridLines yes -displayDivisionLines yes -displayPerspectiveLabels no -displayOrthographicLabels no -displayAxesBold yes -perspectiveLabelPosition axis -orthographicLabelPosition edge;\nviewManip -drawCompass 0 -compassAngle 0 -frontParameters \"\" -homeParameters \"\" -selectionLockParameters \"\";\n}\n");
setAttr ".st" 3;
createNode script -n "sceneConfigurationScriptNode";
@@ -273,6 +285,7 @@ createNode aiAOVDriver -s -n "defaultArnoldDisplayDriver";
createNode objectSet -n "workfileMain";
rename -uid "3C9B5D6F-4579-8E3B-5B7D-4C88865A1C68";
addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
+ addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "id" -ln "id" -dt "string";
addAttr -ci true -sn "family" -ln "family" -dt "string";
addAttr -ci true -sn "subset" -ln "subset" -dt "string";
@@ -281,13 +294,14 @@ createNode objectSet -n "workfileMain";
addAttr -ci true -sn "variant" -ln "variant" -dt "string";
addAttr -ci true -sn "asset" -ln "asset" -dt "string";
addAttr -ci true -sn "task" -ln "task" -dt "string";
- addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
- addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
+ addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
+ addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string";
setAttr ".ihi" 0;
setAttr ".hio" yes;
setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:30d256dac64c";
+ setAttr ".instance_id" -type "string" "911dc92a-ad29-41e5-bbf9-733d56174fb9";
setAttr ".id" -type "string" "pyblish.avalon.instance";
setAttr ".family" -type "string" "workfile";
setAttr ".subset" -type "string" "workfileTest_task";
@@ -296,16 +310,9 @@ createNode objectSet -n "workfileMain";
setAttr ".variant" -type "string" "Main";
setAttr ".asset" -type "string" "test_asset";
setAttr ".task" -type "string" "test_task";
- setAttr ".instance_id" -type "string" "911dc92a-ad29-41e5-bbf9-733d56174fb9";
- setAttr ".publish_attributes" -type "string" "{\"ExtractImportReference\": {\"active\": false}}";
+ setAttr ".publish_attributes" -type "string" "{\"ValidateInstanceInContext\": {\"active\": true}, \"ExtractImportReference\": {\"active\": false}}";
+ setAttr ".creator_attributes" -type "string" "{}";
setAttr ".__creator_attributes_keys" -type "string" "";
-createNode objectSet -n "renderingMain";
- rename -uid "8A999C2F-4922-B15D-8D5C-45A16465B69F";
- addAttr -ci true -sn "pre_creator_identifier" -ln "pre_creator_identifier" -dt "string";
- addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
- setAttr ".ihi" 0;
- setAttr ".pre_creator_identifier" -type "string" "io.openpype.creators.maya.renderlayer";
- setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:042447475732";
createNode renderSetupLayer -n "Main";
rename -uid "2202E438-4CEF-F64E-737C-F48C65E31126";
addAttr -ci true -sn "es" -ln "expandedState" -min 0 -max 1 -at "bool";
@@ -320,55 +327,6 @@ createNode collection -n "defaultCollection";
createNode simpleSelector -n "defaultCollectionSelector";
rename -uid "7CA2F6D8-483C-B020-BC03-EF9563A52163";
setAttr ".pat" -type "string" "*";
-createNode objectSet -n "_renderingMain:Main";
- rename -uid "1EEC3A3B-49CF-0C79-5340-39805174FB8A";
- addAttr -s false -ci true -sn "renderlayer" -ln "renderlayer" -at "message";
- addAttr -ci true -sn "id" -ln "id" -dt "string";
- addAttr -ci true -sn "family" -ln "family" -dt "string";
- addAttr -ci true -sn "subset" -ln "subset" -dt "string";
- addAttr -ci true -sn "active" -ln "active" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "creator_identifier" -ln "creator_identifier" -dt "string";
- addAttr -ci true -sn "variant" -ln "variant" -dt "string";
- addAttr -ci true -sn "asset" -ln "asset" -dt "string";
- addAttr -ci true -sn "task" -ln "task" -dt "string";
- addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
- addAttr -ci true -sn "review" -ln "review" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "extendFrames" -ln "extendFrames" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "overrideExistingFrame" -ln "overrideExistingFrame" -min 0
- -max 1 -at "bool";
- addAttr -ci true -sn "tileRendering" -ln "tileRendering" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "tilesX" -ln "tilesX" -at "long";
- addAttr -ci true -sn "tilesY" -ln "tilesY" -at "long";
- addAttr -ci true -sn "convertToScanline" -ln "convertToScanline" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "useReferencedAovs" -ln "useReferencedAovs" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "renderSetupIncludeLights" -ln "renderSetupIncludeLights" -min
- 0 -max 1 -at "bool";
- addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
- addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
- -dt "string";
- addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
- setAttr ".ihi" 0;
- setAttr ".id" -type "string" "pyblish.avalon.instance";
- setAttr ".family" -type "string" "renderlayer";
- setAttr ".subset" -type "string" "renderMain";
- setAttr -cb on ".active" yes;
- setAttr ".creator_identifier" -type "string" "io.openpype.creators.maya.renderlayer";
- setAttr ".variant" -type "string" "Main";
- setAttr ".asset" -type "string" "test_asset";
- setAttr ".task" -type "string" "test_task";
- setAttr ".instance_id" -type "string" "8a9cfb85-9602-4e5e-a4bc-27a2986bae7f";
- setAttr -cb on ".review" yes;
- setAttr -cb on ".extendFrames";
- setAttr -cb on ".overrideExistingFrame" yes;
- setAttr -cb on ".tileRendering";
- setAttr -cb on ".tilesX" 2;
- setAttr -cb on ".tilesY" 2;
- setAttr -cb on ".convertToScanline";
- setAttr -cb on ".useReferencedAovs";
- setAttr -cb on ".renderSetupIncludeLights" yes;
- setAttr ".publish_attributes" -type "string" "{\"CollectDeadlinePools\": {\"primaryPool\": \"\", \"secondaryPool\": \"\"}, \"ValidateDeadlinePools\": {\"active\": true}, \"ValidateFrameRange\": {\"active\": true}, \"ExtractImportReference\": {\"active\": false}, \"MayaSubmitDeadline\": {\"priority\": 50, \"chunkSize\": 1, \"machineList\": \"\", \"whitelist\": false, \"tile_priority\": 50, \"strict_error_checking\": true}, \"ProcessSubmittedJobOnFarm\": {\"publishJobState\": \"Active\"}}";
- setAttr ".__creator_attributes_keys" -type "string" "review,extendFrames,overrideExistingFrame,tileRendering,tilesX,tilesY,convertToScanline,useReferencedAovs,renderSetupIncludeLights";
- setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:69960f336351";
select -ne :time1;
setAttr ".o" 1001;
setAttr ".unw" 1001;
@@ -435,8 +393,6 @@ select -ne :defaultColorMgtGlobals;
select -ne :hardwareRenderGlobals;
setAttr ".ctrs" 256;
setAttr ".btrs" 512;
-select -ne :ikSystem;
- setAttr -s 4 ".sol";
connectAttr "rs_Main.ri" ":persp.rlio[0]";
connectAttr "rs_Main.ri" ":top.rlio[0]";
connectAttr "rs_Main.ri" ":front.rlio[0]";
@@ -459,7 +415,6 @@ connectAttr ":defaultArnoldDisplayDriver.msg" ":defaultArnoldRenderOptions.drive
-na;
connectAttr ":defaultArnoldFilter.msg" ":defaultArnoldRenderOptions.filt";
connectAttr ":defaultArnoldDriver.msg" ":defaultArnoldRenderOptions.drvr";
-connectAttr "_renderingMain:Main.msg" "renderingMain.dnsm" -na;
connectAttr "rs_Main.msg" "Main.lrl";
connectAttr "renderSetup.lit" "Main.pls";
connectAttr "defaultCollection.msg" "Main.cl";
@@ -468,9 +423,8 @@ connectAttr "renderLayerManager.rlmi[1]" "rs_Main.rlid";
connectAttr "defaultCollectionSelector.c" "defaultCollection.sel";
connectAttr "Main.lit" "defaultCollection.pls";
connectAttr "Main.nic" "defaultCollection.pic";
-connectAttr "Main.msg" "_renderingMain:Main.renderlayer";
connectAttr "defaultRenderLayer.msg" ":defaultRenderingList1.r" -na;
connectAttr "rs_Main.msg" ":defaultRenderingList1.r" -na;
connectAttr "pSphere1_GEOShape1.iog" ":initialShadingGroup.dsm" -na;
connectAttr "pDiscShape1.iog" ":initialShadingGroup.dsm" -na;
-// End of test_project_test_asset_test_task_v001.ma
+// End of test_project_test_asset_test_task_v002.ma
diff --git a/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v002.ma b/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v002.ma
index 57bcfdae5b..6bd334466a 100644
--- a/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v002.ma
+++ b/tests/integration/hosts/maya/test_publish_in_maya/expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v002.ma
@@ -1,22 +1,22 @@
-//Maya ASCII 2024 scene
+//Maya ASCII 2023 scene
//Name: test_project_test_asset_test_task_v002.ma
-//Last modified: Tue, Oct 31, 2023 08:24:19 AM
+//Last modified: Thu, Dec 07, 2023 03:55:12 PM
//Codeset: 1252
-requires maya "2024";
-requires -nodeType "polyDisc" "modelingToolkit" "0.0.0.0";
-requires "stereoCamera" "10.0";
-requires -nodeType "aiOptions" -nodeType "aiAOVDriver" -nodeType "aiAOVFilter" "mtoa" "5.3.0";
+requires maya "2023";
requires -nodeType "simpleSelector" -nodeType "renderSetupLayer" -nodeType "renderSetup"
-nodeType "collection" "renderSetup.py" "1.0";
requires "stereoCamera" "10.0";
+requires -nodeType "aiOptions" -nodeType "aiAOVDriver" -nodeType "aiAOVFilter" "mtoa" "5.2.1.1";
+requires -nodeType "polyDisc" "modelingToolkit" "0.0.0.0";
+requires "stereoCamera" "10.0";
currentUnit -l centimeter -a degree -t pal;
fileInfo "application" "maya";
-fileInfo "product" "Maya 2024";
-fileInfo "version" "2024";
-fileInfo "cutIdentifier" "202302170737-4500172811";
+fileInfo "product" "Maya 2023";
+fileInfo "version" "2023";
+fileInfo "cutIdentifier" "202211021031-847a9f9623";
fileInfo "osv" "Windows 10 Pro v2009 (Build: 19045)";
fileInfo "license" "education";
-fileInfo "UUID" "6C5CC57A-4CC3-7373-4411-B3B80BC40815";
+fileInfo "UUID" "7CC7E6D5-4F37-DB90-8A84-8493449019BF";
fileInfo "OpenPypeContext" "eyJwdWJsaXNoX2F0dHJpYnV0ZXMiOiB7IlZhbGlkYXRlQ29udGFpbmVycyI6IHsiYWN0aXZlIjogdHJ1ZX19fQ==";
createNode transform -s -n "persp";
rename -uid "D52C935B-47C9-D868-A875-D799DD17B3A1";
@@ -142,20 +142,20 @@ createNode camera -n "perspShape1" -p "persp1";
setAttr ".hc" -type "string" "viewSet -p %camera";
setAttr ".dr" yes;
createNode lightLinker -s -n "lightLinker1";
- rename -uid "D0EBF10B-4952-5C9F-42A8-D6A660FF173F";
+ rename -uid "FBA13844-432C-E5C2-040E-A0925F2F0B8F";
setAttr -s 2 ".lnk";
setAttr -s 2 ".slnk";
createNode shapeEditorManager -n "shapeEditorManager";
- rename -uid "30DE6463-4107-330C-8FE3-4EA1C402A632";
+ rename -uid "E3FDBA44-4665-FFBF-74F3-BDBF4F8F7B32";
createNode poseInterpolatorManager -n "poseInterpolatorManager";
- rename -uid "64911358-4E6A-5ACC-75A4-4F965FCD606E";
+ rename -uid "8834BA6F-47BE-8E76-4510-E2A7F3525077";
createNode displayLayerManager -n "layerManager";
- rename -uid "B3C9D791-45C2-E529-2A9A-9B88F2D5E17E";
+ rename -uid "427D260A-43FC-DC22-4E80-46A0E90839B2";
createNode displayLayer -n "defaultLayer";
rename -uid "4A776D1B-401F-7069-1C74-A7AAE84CEE03";
setAttr ".ufem" -type "stringArray" 0 ;
createNode renderLayerManager -n "renderLayerManager";
- rename -uid "68F97550-4CB6-1D4A-99B0-CCA5DBE5D6B1";
+ rename -uid "F1B8B519-43D1-5DE5-00F6-42A9514335E8";
setAttr -s 2 ".rlmi[1]" 1;
setAttr -s 2 ".rlmi";
createNode renderLayer -n "defaultRenderLayer";
@@ -168,6 +168,7 @@ createNode polySphere -n "polySphere1";
createNode objectSet -n "modelMain";
rename -uid "A76AD4F8-4CF5-AA0D-4E98-BABEE6454CC3";
addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
+ addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "id" -ln "id" -dt "string";
addAttr -ci true -sn "family" -ln "family" -dt "string";
addAttr -ci true -sn "subset" -ln "subset" -dt "string";
@@ -176,18 +177,19 @@ createNode objectSet -n "modelMain";
addAttr -ci true -sn "variant" -ln "variant" -dt "string";
addAttr -ci true -sn "asset" -ln "asset" -dt "string";
addAttr -ci true -sn "task" -ln "task" -dt "string";
- addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "writeColorSets" -ln "writeColorSets" -min 0 -max 1 -at "bool";
addAttr -ci true -sn "writeFaceSets" -ln "writeFaceSets" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "includeParentHierarchy" -ln "includeParentHierarchy" -min
+ addAttr -ci true -sn "includeParentHierarchy" -ln "includeParentHierarchy" -min
0 -max 1 -at "bool";
addAttr -ci true -sn "attr" -ln "attr" -dt "string";
addAttr -ci true -sn "attrPrefix" -ln "attrPrefix" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
- addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
+ addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
+ addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string";
setAttr ".ihi" 0;
setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:7364ea6776c9";
+ setAttr ".instance_id" -type "string" "6889d3db-b813-43db-96de-9ba555dc4472";
setAttr ".id" -type "string" "pyblish.avalon.instance";
setAttr ".family" -type "string" "model";
setAttr ".subset" -type "string" "modelMain";
@@ -196,59 +198,68 @@ createNode objectSet -n "modelMain";
setAttr ".variant" -type "string" "Main";
setAttr ".asset" -type "string" "test_asset";
setAttr ".task" -type "string" "test_task";
- setAttr ".instance_id" -type "string" "6889d3db-b813-43db-96de-9ba555dc4472";
setAttr -cb on ".writeColorSets";
setAttr -cb on ".writeFaceSets";
setAttr -cb on ".includeParentHierarchy";
setAttr ".attr" -type "string" "";
setAttr ".attrPrefix" -type "string" "";
- setAttr ".publish_attributes" -type "string" "{\"ValidateNodeIDsRelated\": {\"active\": true}, \"ValidateTransformNamingSuffix\": {\"active\": true}, \"ValidateColorSets\": {\"active\": true}, \"ValidateMeshArnoldAttributes\": {\"active\": true}, \"ValidateMeshHasUVs\": {\"active\": true}, \"ValidateMeshNonZeroEdgeLength\": {\"active\": true}, \"ExtractModel\": {\"active\": true}}";
+ setAttr ".publish_attributes" -type "string" "{\"ValidateNodeIDsRelated\": {\"active\": true}, \"ValidateInstanceInContext\": {\"active\": true}, \"ValidateTransformNamingSuffix\": {\"active\": true}, \"ValidateColorSets\": {\"active\": true}, \"ValidateMeshHasUVs\": {\"active\": true}, \"ValidateMeshNonZeroEdgeLength\": {\"active\": true}, \"ExtractModel\": {\"active\": true}, \"ValidateMeshArnoldAttributes\": {\"active\": true}}";
+ setAttr ".creator_attributes" -type "string" "{}";
setAttr ".__creator_attributes_keys" -type "string" "writeColorSets,writeFaceSets,includeParentHierarchy,attr,attrPrefix";
createNode script -n "uiConfigurationScriptNode";
rename -uid "4B7AFB53-452E-E870-63E1-CCA1DD6EAF13";
setAttr ".b" -type "string" (
"// Maya Mel UI Configuration File.\n//\n// This script is machine generated. Edit at your own risk.\n//\n//\n\nglobal string $gMainPane;\nif (`paneLayout -exists $gMainPane`) {\n\n\tglobal int $gUseScenePanelConfig;\n\tint $useSceneConfig = $gUseScenePanelConfig;\n\tint $nodeEditorPanelVisible = stringArrayContains(\"nodeEditorPanel1\", `getPanel -vis`);\n\tint $nodeEditorWorkspaceControlOpen = (`workspaceControl -exists nodeEditorPanel1Window` && `workspaceControl -q -visible nodeEditorPanel1Window`);\n\tint $menusOkayInPanels = `optionVar -q allowMenusInPanels`;\n\tint $nVisPanes = `paneLayout -q -nvp $gMainPane`;\n\tint $nPanes = 0;\n\tstring $editorName;\n\tstring $panelName;\n\tstring $itemFilterName;\n\tstring $panelConfig;\n\n\t//\n\t// get current state of the UI\n\t//\n\tsceneUIReplacement -update $gMainPane;\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Top View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Top View\")) -mbv $menusOkayInPanels $panelName;\n"
- + "\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|top\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n"
+ + "\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|top\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n"
+ " -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n"
- + " -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -excludeObjectPreset \"All\" \n -shadows 0\n -captureSequenceNumber -1\n -width 1\n -height 1\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n"
- + "\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Side View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Side View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|side\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n"
- + " -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n"
- + " -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -excludeObjectPreset \"All\" \n"
- + " -shadows 0\n -captureSequenceNumber -1\n -width 1\n -height 1\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Front View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Front View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|front\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n"
- + " -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n"
- + " -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n"
- + " -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -excludeObjectPreset \"All\" \n -shadows 0\n -captureSequenceNumber -1\n -width 1\n -height 1\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Persp View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Persp View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n"
- + " -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n"
- + " -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n"
- + " -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -excludeObjectPreset \"All\" \n -shadows 0\n -captureSequenceNumber -1\n -width 1319\n -height 718\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n"
- + "\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"ToggledOutliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"ToggledOutliner\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n outlinerEditor -e \n -docTag \"isolOutln_fromSeln\" \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 1\n -showReferenceMembers 1\n -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 1\n"
- + " -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -isSet 0\n -isSetMember 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n"
- + " -longNames 0\n -niceNames 1\n -selectCommand \"print(\\\"\\\")\" \n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n -renderFilterIndex 0\n -selectionOrder \"chronological\" \n -expandAttribute 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"Outliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"Outliner\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n outlinerEditor -e \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 0\n -showConnected 0\n"
- + " -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n"
- + " -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"graphEditor\" (localizedPanelLabel(\"Graph Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Graph Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n"
- + " outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 1\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 0\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n"
- + " -autoSelectNewObjects 1\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 1\n -setFilter \"0\" \n -showSetMembers 0\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 1\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n"
- + " -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"GraphEd\");\n animCurveEditor -e \n -displayValues 0\n -snapTime \"integer\" \n -snapValue \"none\" \n -showPlayRangeShades \"on\" \n -lockPlayRangeShades \"off\" \n -smoothness \"fine\" \n -resultSamples 1.041667\n -resultScreenSamples 0\n -resultUpdate \"delayed\" \n -showUpstreamCurves 1\n -keyMinScale 1\n -stackedCurvesMin -1\n -stackedCurvesMax 1\n -stackedCurvesSpace 0.2\n -preSelectionHighlight 0\n -constrainDrag 0\n -valueLinesToggle 1\n -highlightAffectedCurves 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dopeSheetPanel\" (localizedPanelLabel(\"Dope Sheet\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dope Sheet\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n"
- + " -showUpstreamCurves 1\n -showUnitlessCurves 0\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 1\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"0\" \n -showSetMembers 0\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n"
- + " -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"DopeSheetEd\");\n dopeSheetEditor -e \n -displayValues 0\n -snapTime \"integer\" \n -snapValue \"none\" \n -outliner \"dopeSheetPanel1OutlineEd\" \n -showSummary 1\n -showScene 0\n -hierarchyBelow 0\n -showTicks 1\n -selectionWindow 0 0 0 0 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"timeEditorPanel\" (localizedPanelLabel(\"Time Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Time Editor\")) -mbv $menusOkayInPanels $panelName;\n"
- + "\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"clipEditorPanel\" (localizedPanelLabel(\"Trax Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Trax Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = clipEditorNameFromPanel($panelName);\n clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 0 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"sequenceEditorPanel\" (localizedPanelLabel(\"Camera Sequencer\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Camera Sequencer\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = sequenceEditorNameFromPanel($panelName);\n"
- + " clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperGraphPanel\" (localizedPanelLabel(\"Hypergraph Hierarchy\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypergraph Hierarchy\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"HyperGraphEd\");\n hyperGraph -e \n -graphLayoutStyle \"hierarchicalLayout\" \n -orientation \"horiz\" \n -mergeConnections 0\n -zoom 1\n -animateTransition 0\n -showRelationships 1\n -showShapes 0\n -showDeformers 0\n -showExpressions 0\n -showConstraints 0\n"
- + " -showConnectionFromSelected 0\n -showConnectionToSelected 0\n -showConstraintLabels 0\n -showUnderworld 0\n -showInvisible 0\n -transitionFrames 1\n -opaqueContainers 0\n -freeform 0\n -imagePosition 0 0 \n -imageScale 1\n -imageEnabled 0\n -graphType \"DAG\" \n -heatMapDisplay 0\n -updateSelection 1\n -updateNodeAdded 1\n -useDrawOverrideColor 0\n -limitGraphTraversal -1\n -range 0 0 \n -iconSize \"smallIcons\" \n -showCachedConnections 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperShadePanel\" (localizedPanelLabel(\"Hypershade\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypershade\")) -mbv $menusOkayInPanels $panelName;\n"
- + "\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"visorPanel\" (localizedPanelLabel(\"Visor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Visor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"nodeEditorPanel\" (localizedPanelLabel(\"Node Editor\")) `;\n\tif ($nodeEditorPanelVisible || $nodeEditorWorkspaceControlOpen) {\n\t\tif (\"\" == $panelName) {\n\t\t\tif ($useSceneConfig) {\n\t\t\t\t$panelName = `scriptedPanel -unParent -type \"nodeEditorPanel\" -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels `;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n"
- + " -connectNodeOnCreation 0\n -connectOnDrop 0\n -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n -additiveGraphingMode 0\n -connectedGraphingMode 1\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -showUnitConversions 0\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\t}\n\t\t} else {\n\t\t\t$label = `panel -q -label $panelName`;\n"
- + "\t\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n -additiveGraphingMode 0\n -connectedGraphingMode 1\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n"
- + " -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -showUnitConversions 0\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\tif (!$useSceneConfig) {\n\t\t\t\tpanel -e -l $label $panelName;\n\t\t\t}\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"createNodePanel\" (localizedPanelLabel(\"Create Node\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Create Node\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"polyTexturePlacementPanel\" (localizedPanelLabel(\"UV Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"UV Editor\")) -mbv $menusOkayInPanels $panelName;\n"
- + "\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"renderWindowPanel\" (localizedPanelLabel(\"Render View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Render View\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"shapePanel\" (localizedPanelLabel(\"Shape Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tshapePanel -edit -l (localizedPanelLabel(\"Shape Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"posePanel\" (localizedPanelLabel(\"Pose Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tposePanel -edit -l (localizedPanelLabel(\"Pose Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n"
- + "\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynRelEdPanel\" (localizedPanelLabel(\"Dynamic Relationships\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dynamic Relationships\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"relationshipPanel\" (localizedPanelLabel(\"Relationship Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Relationship Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"referenceEditorPanel\" (localizedPanelLabel(\"Reference Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Reference Editor\")) -mbv $menusOkayInPanels $panelName;\n"
- + "\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynPaintScriptedPanelType\" (localizedPanelLabel(\"Paint Effects\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Paint Effects\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"scriptEditorPanel\" (localizedPanelLabel(\"Script Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Script Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"profilerPanel\" (localizedPanelLabel(\"Profiler Tool\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Profiler Tool\")) -mbv $menusOkayInPanels $panelName;\n"
- + "\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"contentBrowserPanel\" (localizedPanelLabel(\"Content Browser\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Content Browser\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"Stereo\" (localizedPanelLabel(\"Stereo\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Stereo\")) -mbv $menusOkayInPanels $panelName;\n{ string $editorName = ($panelName+\"Editor\");\n stereoCameraView -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"wireframe\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n"
- + " -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 1\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 4 4 \n"
- + " -bumpResolution 4 4 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 0\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n"
- + " -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 0\n -height 0\n -sceneRenderFilter 0\n -displayMode \"centerEye\" \n -viewColor 0 0 0 1 \n -useCustomBackground 1\n $editorName;\n stereoCameraView -e -viewSelected 0 $editorName;\n stereoCameraView -e \n"
- + " -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName; };\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\tif ($useSceneConfig) {\n string $configName = `getPanel -cwl (localizedPanelLabel(\"Current Layout\"))`;\n if (\"\" != $configName) {\n\t\t\tpanelConfiguration -edit -label (localizedPanelLabel(\"Current Layout\")) \n\t\t\t\t-userCreated false\n\t\t\t\t-defaultImage \"vacantCell.xP:/\"\n\t\t\t\t-image \"\"\n\t\t\t\t-sc false\n\t\t\t\t-configString \"global string $gMainPane; paneLayout -e -cn \\\"single\\\" -ps 1 100 100 $gMainPane;\"\n\t\t\t\t-removeAllPanels\n\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Persp View\")) \n\t\t\t\t\t\"modelPanel\"\n"
- + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 16384\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -excludeObjectPreset \\\"All\\\" \\n -shadows 0\\n -captureSequenceNumber -1\\n -width 1319\\n -height 718\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName;\\nmodelEditor -e \\n -pluginObjects \\\"gpuCacheDisplayFilter\\\" 1 \\n $editorName\"\n"
- + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 16384\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -excludeObjectPreset \\\"All\\\" \\n -shadows 0\\n -captureSequenceNumber -1\\n -width 1319\\n -height 718\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName;\\nmodelEditor -e \\n -pluginObjects \\\"gpuCacheDisplayFilter\\\" 1 \\n $editorName\"\n"
+ + " -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 477\n -height 276\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Side View\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Side View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|side\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n"
+ + " -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n"
+ + " -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 476\n -height 276\n -sceneRenderFilter 0\n $editorName;\n"
+ + " modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Front View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Front View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|front\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n"
+ + " -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n"
+ + " -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n"
+ + " -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 477\n -height 276\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Persp View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Persp View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n"
+ + " -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n"
+ + " -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n"
+ + " -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 476\n -height 276\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"ToggledOutliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"ToggledOutliner\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n outlinerEditor -e \n -docTag \"isolOutln_fromSeln\" \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 1\n -showReferenceMembers 1\n"
+ + " -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n"
+ + " -isSet 0\n -isSetMember 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -selectCommand \"print(\\\"\\\")\" \n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n -renderFilterIndex 0\n -selectionOrder \"chronological\" \n -expandAttribute 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"Outliner\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"Outliner\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n outlinerEditor -e \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n"
+ + " -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n"
+ + " $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"graphEditor\" (localizedPanelLabel(\"Graph Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Graph Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 1\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n"
+ + " -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 0\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 1\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 1\n -setFilter \"0\" \n -showSetMembers 0\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n"
+ + " -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 1\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"GraphEd\");\n animCurveEditor -e \n -displayValues 0\n -snapTime \"integer\" \n -snapValue \"none\" \n -showPlayRangeShades \"on\" \n -lockPlayRangeShades \"off\" \n -smoothness \"fine\" \n -resultSamples 1.041667\n -resultScreenSamples 0\n -resultUpdate \"delayed\" \n -showUpstreamCurves 1\n -keyMinScale 1\n -stackedCurvesMin -1\n -stackedCurvesMax 1\n"
+ + " -stackedCurvesSpace 0.2\n -preSelectionHighlight 0\n -constrainDrag 0\n -valueLinesToggle 1\n -highlightAffectedCurves 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dopeSheetPanel\" (localizedPanelLabel(\"Dope Sheet\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dope Sheet\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n"
+ + " -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 0\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 1\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"0\" \n -showSetMembers 0\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n"
+ + " -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"DopeSheetEd\");\n dopeSheetEditor -e \n -displayValues 0\n -snapTime \"integer\" \n -snapValue \"none\" \n -outliner \"dopeSheetPanel1OutlineEd\" \n -showSummary 1\n -showScene 0\n -hierarchyBelow 0\n"
+ + " -showTicks 1\n -selectionWindow 0 0 0 0 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"timeEditorPanel\" (localizedPanelLabel(\"Time Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Time Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"clipEditorPanel\" (localizedPanelLabel(\"Trax Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Trax Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = clipEditorNameFromPanel($panelName);\n clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 0 \n"
+ + " $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"sequenceEditorPanel\" (localizedPanelLabel(\"Camera Sequencer\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Camera Sequencer\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = sequenceEditorNameFromPanel($panelName);\n clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperGraphPanel\" (localizedPanelLabel(\"Hypergraph Hierarchy\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypergraph Hierarchy\")) -mbv $menusOkayInPanels $panelName;\n"
+ + "\n\t\t\t$editorName = ($panelName+\"HyperGraphEd\");\n hyperGraph -e \n -graphLayoutStyle \"hierarchicalLayout\" \n -orientation \"horiz\" \n -mergeConnections 0\n -zoom 1\n -animateTransition 0\n -showRelationships 1\n -showShapes 0\n -showDeformers 0\n -showExpressions 0\n -showConstraints 0\n -showConnectionFromSelected 0\n -showConnectionToSelected 0\n -showConstraintLabels 0\n -showUnderworld 0\n -showInvisible 0\n -transitionFrames 1\n -opaqueContainers 0\n -freeform 0\n -imagePosition 0 0 \n -imageScale 1\n -imageEnabled 0\n -graphType \"DAG\" \n -heatMapDisplay 0\n -updateSelection 1\n -updateNodeAdded 1\n -useDrawOverrideColor 0\n -limitGraphTraversal -1\n"
+ + " -range 0 0 \n -iconSize \"smallIcons\" \n -showCachedConnections 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperShadePanel\" (localizedPanelLabel(\"Hypershade\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypershade\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"visorPanel\" (localizedPanelLabel(\"Visor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Visor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"nodeEditorPanel\" (localizedPanelLabel(\"Node Editor\")) `;\n\tif ($nodeEditorPanelVisible || $nodeEditorWorkspaceControlOpen) {\n"
+ + "\t\tif (\"\" == $panelName) {\n\t\t\tif ($useSceneConfig) {\n\t\t\t\t$panelName = `scriptedPanel -unParent -type \"nodeEditorPanel\" -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels `;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n -additiveGraphingMode 1\n -connectedGraphingMode 1\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n"
+ + " -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -showUnitConversions 0\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\t}\n\t\t} else {\n\t\t\t$label = `panel -q -label $panelName`;\n\t\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n"
+ + " -additiveGraphingMode 1\n -connectedGraphingMode 1\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -showUnitConversions 0\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\tif (!$useSceneConfig) {\n\t\t\t\tpanel -e -l $label $panelName;\n\t\t\t}\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"createNodePanel\" (localizedPanelLabel(\"Create Node\")) `;\n\tif (\"\" != $panelName) {\n"
+ + "\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Create Node\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"polyTexturePlacementPanel\" (localizedPanelLabel(\"UV Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"UV Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"renderWindowPanel\" (localizedPanelLabel(\"Render View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Render View\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"shapePanel\" (localizedPanelLabel(\"Shape Editor\")) `;\n\tif (\"\" != $panelName) {\n"
+ + "\t\t$label = `panel -q -label $panelName`;\n\t\tshapePanel -edit -l (localizedPanelLabel(\"Shape Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"posePanel\" (localizedPanelLabel(\"Pose Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tposePanel -edit -l (localizedPanelLabel(\"Pose Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynRelEdPanel\" (localizedPanelLabel(\"Dynamic Relationships\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dynamic Relationships\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"relationshipPanel\" (localizedPanelLabel(\"Relationship Editor\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Relationship Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"referenceEditorPanel\" (localizedPanelLabel(\"Reference Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Reference Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynPaintScriptedPanelType\" (localizedPanelLabel(\"Paint Effects\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Paint Effects\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"scriptEditorPanel\" (localizedPanelLabel(\"Script Editor\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Script Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"profilerPanel\" (localizedPanelLabel(\"Profiler Tool\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Profiler Tool\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"contentBrowserPanel\" (localizedPanelLabel(\"Content Browser\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Content Browser\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"Stereo\" (localizedPanelLabel(\"Stereo\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Stereo\")) -mbv $menusOkayInPanels $panelName;\n{ string $editorName = ($panelName+\"Editor\");\n stereoCameraView -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"wireframe\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 1\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n"
+ + " -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 4 4 \n -bumpResolution 4 4 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 0\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n"
+ + " -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n"
+ + " -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 0\n -height 0\n -sceneRenderFilter 0\n -displayMode \"centerEye\" \n -viewColor 0 0 0 1 \n -useCustomBackground 1\n $editorName;\n stereoCameraView -e -viewSelected 0 $editorName; };\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\tif ($useSceneConfig) {\n string $configName = `getPanel -cwl (localizedPanelLabel(\"Current Layout\"))`;\n if (\"\" != $configName) {\n\t\t\tpanelConfiguration -edit -label (localizedPanelLabel(\"Current Layout\")) \n\t\t\t\t-userCreated false\n\t\t\t\t-defaultImage \"vacantCell.xP:/\"\n\t\t\t\t-image \"\"\n\t\t\t\t-sc false\n\t\t\t\t-configString \"global string $gMainPane; paneLayout -e -cn \\\"quad\\\" -ps 1 50 50 -ps 2 50 50 -ps 3 50 50 -ps 4 50 50 $gMainPane;\"\n\t\t\t\t-removeAllPanels\n\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Top View\")) \n"
+ + "\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Top View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|top\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Top View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|top\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Persp View\")) \n\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Side View\")) \n\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Side View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|side\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Side View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|side\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Front View\")) \n\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Front View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera front` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Front View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera front` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ "\t\t\t\t$configName;\n\n setNamedPanelLayout (localizedPanelLabel(\"Current Layout\"));\n }\n\n panelHistory -e -clear mainPanelHistory;\n sceneUIReplacement -clear;\n\t}\n\n\ngrid -spacing 5 -size 12 -divisions 5 -displayAxes yes -displayGridLines yes -displayDivisionLines yes -displayPerspectiveLabels no -displayOrthographicLabels no -displayAxesBold yes -perspectiveLabelPosition axis -orthographicLabelPosition edge;\nviewManip -drawCompass 0 -compassAngle 0 -frontParameters \"\" -homeParameters \"\" -selectionLockParameters \"\";\n}\n");
setAttr ".st" 3;
createNode script -n "sceneConfigurationScriptNode";
@@ -274,6 +285,7 @@ createNode aiAOVDriver -s -n "defaultArnoldDisplayDriver";
createNode objectSet -n "workfileMain";
rename -uid "3C9B5D6F-4579-8E3B-5B7D-4C88865A1C68";
addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
+ addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "id" -ln "id" -dt "string";
addAttr -ci true -sn "family" -ln "family" -dt "string";
addAttr -ci true -sn "subset" -ln "subset" -dt "string";
@@ -282,13 +294,14 @@ createNode objectSet -n "workfileMain";
addAttr -ci true -sn "variant" -ln "variant" -dt "string";
addAttr -ci true -sn "asset" -ln "asset" -dt "string";
addAttr -ci true -sn "task" -ln "task" -dt "string";
- addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
- addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
+ addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
+ addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string";
setAttr ".ihi" 0;
setAttr ".hio" yes;
setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:30d256dac64c";
+ setAttr ".instance_id" -type "string" "911dc92a-ad29-41e5-bbf9-733d56174fb9";
setAttr ".id" -type "string" "pyblish.avalon.instance";
setAttr ".family" -type "string" "workfile";
setAttr ".subset" -type "string" "workfileTest_task";
@@ -297,16 +310,9 @@ createNode objectSet -n "workfileMain";
setAttr ".variant" -type "string" "Main";
setAttr ".asset" -type "string" "test_asset";
setAttr ".task" -type "string" "test_task";
- setAttr ".instance_id" -type "string" "911dc92a-ad29-41e5-bbf9-733d56174fb9";
- setAttr ".publish_attributes" -type "string" "{\"ExtractImportReference\": {\"active\": false}}";
+ setAttr ".publish_attributes" -type "string" "{\"ValidateInstanceInContext\": {\"active\": true}, \"ExtractImportReference\": {\"active\": false}}";
+ setAttr ".creator_attributes" -type "string" "{}";
setAttr ".__creator_attributes_keys" -type "string" "";
-createNode objectSet -n "renderingMain";
- rename -uid "8A999C2F-4922-B15D-8D5C-45A16465B69F";
- addAttr -ci true -sn "pre_creator_identifier" -ln "pre_creator_identifier" -dt "string";
- addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
- setAttr ".ihi" 0;
- setAttr ".pre_creator_identifier" -type "string" "io.openpype.creators.maya.renderlayer";
- setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:042447475732";
createNode renderSetupLayer -n "Main";
rename -uid "2202E438-4CEF-F64E-737C-F48C65E31126";
addAttr -ci true -sn "es" -ln "expandedState" -min 0 -max 1 -at "bool";
@@ -321,55 +327,6 @@ createNode collection -n "defaultCollection";
createNode simpleSelector -n "defaultCollectionSelector";
rename -uid "7CA2F6D8-483C-B020-BC03-EF9563A52163";
setAttr ".pat" -type "string" "*";
-createNode objectSet -n "_renderingMain:Main";
- rename -uid "1EEC3A3B-49CF-0C79-5340-39805174FB8A";
- addAttr -s false -ci true -sn "renderlayer" -ln "renderlayer" -at "message";
- addAttr -ci true -sn "id" -ln "id" -dt "string";
- addAttr -ci true -sn "family" -ln "family" -dt "string";
- addAttr -ci true -sn "subset" -ln "subset" -dt "string";
- addAttr -ci true -sn "active" -ln "active" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "creator_identifier" -ln "creator_identifier" -dt "string";
- addAttr -ci true -sn "variant" -ln "variant" -dt "string";
- addAttr -ci true -sn "asset" -ln "asset" -dt "string";
- addAttr -ci true -sn "task" -ln "task" -dt "string";
- addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
- addAttr -ci true -sn "review" -ln "review" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "extendFrames" -ln "extendFrames" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "overrideExistingFrame" -ln "overrideExistingFrame" -min 0
- -max 1 -at "bool";
- addAttr -ci true -sn "tileRendering" -ln "tileRendering" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "tilesX" -ln "tilesX" -at "long";
- addAttr -ci true -sn "tilesY" -ln "tilesY" -at "long";
- addAttr -ci true -sn "convertToScanline" -ln "convertToScanline" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "useReferencedAovs" -ln "useReferencedAovs" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "renderSetupIncludeLights" -ln "renderSetupIncludeLights" -min
- 0 -max 1 -at "bool";
- addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
- addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
- -dt "string";
- addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
- setAttr ".ihi" 0;
- setAttr ".id" -type "string" "pyblish.avalon.instance";
- setAttr ".family" -type "string" "renderlayer";
- setAttr ".subset" -type "string" "renderMain";
- setAttr -cb on ".active" yes;
- setAttr ".creator_identifier" -type "string" "io.openpype.creators.maya.renderlayer";
- setAttr ".variant" -type "string" "Main";
- setAttr ".asset" -type "string" "test_asset";
- setAttr ".task" -type "string" "test_task";
- setAttr ".instance_id" -type "string" "8a9cfb85-9602-4e5e-a4bc-27a2986bae7f";
- setAttr -cb on ".review" yes;
- setAttr -cb on ".extendFrames";
- setAttr -cb on ".overrideExistingFrame" yes;
- setAttr -cb on ".tileRendering";
- setAttr -cb on ".tilesX" 2;
- setAttr -cb on ".tilesY" 2;
- setAttr -cb on ".convertToScanline";
- setAttr -cb on ".useReferencedAovs";
- setAttr -cb on ".renderSetupIncludeLights" yes;
- setAttr ".publish_attributes" -type "string" "{\"CollectDeadlinePools\": {\"primaryPool\": \"\", \"secondaryPool\": \"\"}, \"ValidateDeadlinePools\": {\"active\": true}, \"ValidateFrameRange\": {\"active\": true}, \"ExtractImportReference\": {\"active\": false}, \"MayaSubmitDeadline\": {\"priority\": 50, \"chunkSize\": 1, \"machineList\": \"\", \"whitelist\": false, \"tile_priority\": 50, \"strict_error_checking\": true}, \"ProcessSubmittedJobOnFarm\": {\"publishJobState\": \"Active\"}}";
- setAttr ".__creator_attributes_keys" -type "string" "review,extendFrames,overrideExistingFrame,tileRendering,tilesX,tilesY,convertToScanline,useReferencedAovs,renderSetupIncludeLights";
- setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:69960f336351";
select -ne :time1;
setAttr ".o" 1001;
setAttr ".unw" 1001;
@@ -378,9 +335,7 @@ select -ne :hardwareRenderingGlobals;
setAttr ".otfva" -type "Int32Array" 22 0 1 1 1 1 1
1 1 1 0 0 0 0 0 0 0 0 0
0 0 0 0 ;
- setAttr ".dli" 1;
setAttr ".fprt" yes;
- setAttr ".rtfm" 1;
select -ne :renderPartition;
setAttr -s 2 ".st";
select -ne :renderGlobalsList1;
@@ -394,7 +349,6 @@ select -ne :standardSurface1;
setAttr ".b" 0.80000001192092896;
setAttr ".bc" -type "float3" 1 1 1 ;
setAttr ".s" 0.20000000298023224;
- setAttr ".sr" 0.40000000596046448;
select -ne :initialShadingGroup;
setAttr -s 2 ".dsm";
setAttr ".ro" yes;
@@ -439,8 +393,6 @@ select -ne :defaultColorMgtGlobals;
select -ne :hardwareRenderGlobals;
setAttr ".ctrs" 256;
setAttr ".btrs" 512;
-select -ne :ikSystem;
- setAttr -s 4 ".sol";
connectAttr "rs_Main.ri" ":persp.rlio[0]";
connectAttr "rs_Main.ri" ":top.rlio[0]";
connectAttr "rs_Main.ri" ":front.rlio[0]";
@@ -463,7 +415,6 @@ connectAttr ":defaultArnoldDisplayDriver.msg" ":defaultArnoldRenderOptions.drive
-na;
connectAttr ":defaultArnoldFilter.msg" ":defaultArnoldRenderOptions.filt";
connectAttr ":defaultArnoldDriver.msg" ":defaultArnoldRenderOptions.drvr";
-connectAttr "_renderingMain:Main.msg" "renderingMain.dnsm" -na;
connectAttr "rs_Main.msg" "Main.lrl";
connectAttr "renderSetup.lit" "Main.pls";
connectAttr "defaultCollection.msg" "Main.cl";
@@ -472,7 +423,6 @@ connectAttr "renderLayerManager.rlmi[1]" "rs_Main.rlid";
connectAttr "defaultCollectionSelector.c" "defaultCollection.sel";
connectAttr "Main.lit" "defaultCollection.pls";
connectAttr "Main.nic" "defaultCollection.pic";
-connectAttr "Main.msg" "_renderingMain:Main.renderlayer";
connectAttr "defaultRenderLayer.msg" ":defaultRenderingList1.r" -na;
connectAttr "rs_Main.msg" ":defaultRenderingList1.r" -na;
connectAttr "pSphere1_GEOShape1.iog" ":initialShadingGroup.dsm" -na;
diff --git a/tests/integration/hosts/maya/test_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma b/tests/integration/hosts/maya/test_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma
index e438d80d5f..2cc87c2f48 100644
--- a/tests/integration/hosts/maya/test_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma
+++ b/tests/integration/hosts/maya/test_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma
@@ -1,22 +1,22 @@
-//Maya ASCII 2022 scene
-//Name: test_project_test_asset_test_task_v001.ma
-//Last modified: Thu, Sep 14, 2023 06:31:00 PM
+//Maya ASCII 2023 scene
+//Name: test_project_test_asset_test_task_v002.ma
+//Last modified: Thu, Dec 07, 2023 03:53:06 PM
//Codeset: 1252
-requires maya "2022";
-requires -nodeType "polyDisc" "modelingToolkit" "0.0.0.0";
-requires "stereoCamera" "10.0";
-requires -nodeType "aiOptions" -nodeType "aiAOVDriver" -nodeType "aiAOVFilter" "mtoa" "5.2.2.1";
+requires maya "2023";
requires -nodeType "simpleSelector" -nodeType "renderSetupLayer" -nodeType "renderSetup"
-nodeType "collection" "renderSetup.py" "1.0";
requires "stereoCamera" "10.0";
+requires -nodeType "aiOptions" -nodeType "aiAOVDriver" -nodeType "aiAOVFilter" "mtoa" "5.2.1.1";
+requires -nodeType "polyDisc" "modelingToolkit" "0.0.0.0";
+requires "stereoCamera" "10.0";
currentUnit -l centimeter -a degree -t pal;
fileInfo "application" "maya";
-fileInfo "product" "Maya 2022";
-fileInfo "version" "2022";
-fileInfo "cutIdentifier" "202205171752-c25c06f306";
-fileInfo "osv" "Windows 10 Pro v2009 (Build: 19044)";
+fileInfo "product" "Maya 2023";
+fileInfo "version" "2023";
+fileInfo "cutIdentifier" "202211021031-847a9f9623";
+fileInfo "osv" "Windows 10 Pro v2009 (Build: 19045)";
fileInfo "license" "education";
-fileInfo "UUID" "019C7F50-40EF-1435-E27F-729F64685E67";
+fileInfo "UUID" "7A992745-4AD5-777F-5575-B4BFAC62B1D0";
fileInfo "OpenPypeContext" "eyJwdWJsaXNoX2F0dHJpYnV0ZXMiOiB7IlZhbGlkYXRlQ29udGFpbmVycyI6IHsiYWN0aXZlIjogdHJ1ZX19fQ==";
createNode transform -s -n "persp";
rename -uid "D52C935B-47C9-D868-A875-D799DD17B3A1";
@@ -142,19 +142,20 @@ createNode camera -n "perspShape1" -p "persp1";
setAttr ".hc" -type "string" "viewSet -p %camera";
setAttr ".dr" yes;
createNode lightLinker -s -n "lightLinker1";
- rename -uid "6B9ADCD4-41B9-5BCC-826D-4A874A278510";
+ rename -uid "09465BD3-42E5-18E4-7906-20A99BB2A6C0";
setAttr -s 2 ".lnk";
setAttr -s 2 ".slnk";
createNode shapeEditorManager -n "shapeEditorManager";
- rename -uid "5B4518C5-46C9-6921-690E-EFAF77B21A36";
+ rename -uid "9F2E8009-4D69-046B-FCC4-28A8CE8F86DB";
createNode poseInterpolatorManager -n "poseInterpolatorManager";
- rename -uid "8518F293-4F06-BFF2-647A-72A099FBF025";
+ rename -uid "6757AD81-40B0-A747-69C3-D9A56259571E";
createNode displayLayerManager -n "layerManager";
- rename -uid "04D880D5-4D86-0C58-CA3D-208ABE3E1E16";
+ rename -uid "6F055ED5-4D91-8F85-7951-B4A13543A561";
createNode displayLayer -n "defaultLayer";
rename -uid "4A776D1B-401F-7069-1C74-A7AAE84CEE03";
+ setAttr ".ufem" -type "stringArray" 0 ;
createNode renderLayerManager -n "renderLayerManager";
- rename -uid "B719B8BE-46BF-12E6-BEBA-B0AD4DBDBA87";
+ rename -uid "55626D2B-4FD5-61A1-7AB2-47B13F19D8AA";
setAttr -s 2 ".rlmi[1]" 1;
setAttr -s 2 ".rlmi";
createNode renderLayer -n "defaultRenderLayer";
@@ -167,6 +168,7 @@ createNode polySphere -n "polySphere1";
createNode objectSet -n "modelMain";
rename -uid "A76AD4F8-4CF5-AA0D-4E98-BABEE6454CC3";
addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
+ addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "id" -ln "id" -dt "string";
addAttr -ci true -sn "family" -ln "family" -dt "string";
addAttr -ci true -sn "subset" -ln "subset" -dt "string";
@@ -175,18 +177,19 @@ createNode objectSet -n "modelMain";
addAttr -ci true -sn "variant" -ln "variant" -dt "string";
addAttr -ci true -sn "asset" -ln "asset" -dt "string";
addAttr -ci true -sn "task" -ln "task" -dt "string";
- addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "writeColorSets" -ln "writeColorSets" -min 0 -max 1 -at "bool";
addAttr -ci true -sn "writeFaceSets" -ln "writeFaceSets" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "includeParentHierarchy" -ln "includeParentHierarchy" -min
+ addAttr -ci true -sn "includeParentHierarchy" -ln "includeParentHierarchy" -min
0 -max 1 -at "bool";
addAttr -ci true -sn "attr" -ln "attr" -dt "string";
addAttr -ci true -sn "attrPrefix" -ln "attrPrefix" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
- addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
+ addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
+ addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string";
setAttr ".ihi" 0;
setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:7364ea6776c9";
+ setAttr ".instance_id" -type "string" "6889d3db-b813-43db-96de-9ba555dc4472";
setAttr ".id" -type "string" "pyblish.avalon.instance";
setAttr ".family" -type "string" "model";
setAttr ".subset" -type "string" "modelMain";
@@ -195,59 +198,68 @@ createNode objectSet -n "modelMain";
setAttr ".variant" -type "string" "Main";
setAttr ".asset" -type "string" "test_asset";
setAttr ".task" -type "string" "test_task";
- setAttr ".instance_id" -type "string" "6889d3db-b813-43db-96de-9ba555dc4472";
setAttr -cb on ".writeColorSets";
setAttr -cb on ".writeFaceSets";
setAttr -cb on ".includeParentHierarchy";
setAttr ".attr" -type "string" "";
setAttr ".attrPrefix" -type "string" "";
- setAttr ".publish_attributes" -type "string" "{\"ValidateNodeIDsRelated\": {\"active\": true}, \"ValidateTransformNamingSuffix\": {\"active\": true}, \"ValidateColorSets\": {\"active\": true}, \"ValidateMeshArnoldAttributes\": {\"active\": true}, \"ValidateMeshHasUVs\": {\"active\": true}, \"ValidateMeshNonZeroEdgeLength\": {\"active\": true}, \"ExtractModel\": {\"active\": true}}";
+ setAttr ".publish_attributes" -type "string" "{\"ValidateNodeIDsRelated\": {\"active\": true}, \"ValidateInstanceInContext\": {\"active\": true}, \"ValidateTransformNamingSuffix\": {\"active\": true}, \"ValidateColorSets\": {\"active\": true}, \"ValidateMeshHasUVs\": {\"active\": true}, \"ValidateMeshNonZeroEdgeLength\": {\"active\": true}, \"ExtractModel\": {\"active\": true}, \"ValidateMeshArnoldAttributes\": {\"active\": true}}";
+ setAttr ".creator_attributes" -type "string" "{}";
setAttr ".__creator_attributes_keys" -type "string" "writeColorSets,writeFaceSets,includeParentHierarchy,attr,attrPrefix";
createNode script -n "uiConfigurationScriptNode";
rename -uid "4B7AFB53-452E-E870-63E1-CCA1DD6EAF13";
setAttr ".b" -type "string" (
"// Maya Mel UI Configuration File.\n//\n// This script is machine generated. Edit at your own risk.\n//\n//\n\nglobal string $gMainPane;\nif (`paneLayout -exists $gMainPane`) {\n\n\tglobal int $gUseScenePanelConfig;\n\tint $useSceneConfig = $gUseScenePanelConfig;\n\tint $nodeEditorPanelVisible = stringArrayContains(\"nodeEditorPanel1\", `getPanel -vis`);\n\tint $nodeEditorWorkspaceControlOpen = (`workspaceControl -exists nodeEditorPanel1Window` && `workspaceControl -q -visible nodeEditorPanel1Window`);\n\tint $menusOkayInPanels = `optionVar -q allowMenusInPanels`;\n\tint $nVisPanes = `paneLayout -q -nvp $gMainPane`;\n\tint $nPanes = 0;\n\tstring $editorName;\n\tstring $panelName;\n\tstring $itemFilterName;\n\tstring $panelConfig;\n\n\t//\n\t// get current state of the UI\n\t//\n\tsceneUIReplacement -update $gMainPane;\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Top View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Top View\")) -mbv $menusOkayInPanels $panelName;\n"
- + "\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|top\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n"
+ + "\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|top\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n"
+ " -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n"
- + " -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 1\n -height 1\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n"
- + "\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Side View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Side View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|side\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n"
- + " -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n"
- + " -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 1\n -height 1\n"
- + " -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Front View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Front View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|front\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n"
- + " -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n"
- + " -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n"
- + " -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 1\n -height 1\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Persp View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Persp View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n"
- + " -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n"
- + " -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n"
- + " -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 1312\n -height 732\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n modelEditor -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"ToggledOutliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"ToggledOutliner\")) -mbv $menusOkayInPanels $panelName;\n"
- + "\t\t$editorName = $panelName;\n outlinerEditor -e \n -docTag \"isolOutln_fromSeln\" \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 1\n -showReferenceMembers 1\n -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n"
- + " -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -isSet 0\n -isSetMember 0\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -selectCommand \"print(\\\"\\\")\" \n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 1\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n -renderFilterIndex 0\n"
- + " -selectionOrder \"chronological\" \n -expandAttribute 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"Outliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"Outliner\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n outlinerEditor -e \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n"
- + " -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n"
- + " -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"graphEditor\" (localizedPanelLabel(\"Graph Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Graph Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n"
- + " -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 1\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 0\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 1\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 1\n -setFilter \"0\" \n -showSetMembers 0\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -displayMode \"DAG\" \n -expandObjects 0\n"
- + " -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 1\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"GraphEd\");\n animCurveEditor -e \n -displayValues 0\n -snapTime \"integer\" \n -snapValue \"none\" \n -showPlayRangeShades \"on\" \n -lockPlayRangeShades \"off\" \n -smoothness \"fine\" \n -resultSamples 1.041667\n"
- + " -resultScreenSamples 0\n -resultUpdate \"delayed\" \n -showUpstreamCurves 1\n -keyMinScale 1\n -stackedCurvesMin -1\n -stackedCurvesMax 1\n -stackedCurvesSpace 0.2\n -preSelectionHighlight 0\n -constrainDrag 0\n -valueLinesToggle 1\n -highlightAffectedCurves 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dopeSheetPanel\" (localizedPanelLabel(\"Dope Sheet\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dope Sheet\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n"
- + " -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 0\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 1\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"0\" \n -showSetMembers 0\n"
- + " -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"DopeSheetEd\");\n dopeSheetEditor -e \n -displayValues 0\n -snapTime \"integer\" \n"
- + " -snapValue \"none\" \n -outliner \"dopeSheetPanel1OutlineEd\" \n -showSummary 1\n -showScene 0\n -hierarchyBelow 0\n -showTicks 1\n -selectionWindow 0 0 0 0 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"timeEditorPanel\" (localizedPanelLabel(\"Time Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Time Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"clipEditorPanel\" (localizedPanelLabel(\"Trax Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Trax Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = clipEditorNameFromPanel($panelName);\n"
- + " clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 0 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"sequenceEditorPanel\" (localizedPanelLabel(\"Camera Sequencer\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Camera Sequencer\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = sequenceEditorNameFromPanel($panelName);\n clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperGraphPanel\" (localizedPanelLabel(\"Hypergraph Hierarchy\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypergraph Hierarchy\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"HyperGraphEd\");\n hyperGraph -e \n -graphLayoutStyle \"hierarchicalLayout\" \n -orientation \"horiz\" \n -mergeConnections 0\n -zoom 1\n -animateTransition 0\n -showRelationships 1\n -showShapes 0\n -showDeformers 0\n -showExpressions 0\n -showConstraints 0\n -showConnectionFromSelected 0\n -showConnectionToSelected 0\n -showConstraintLabels 0\n -showUnderworld 0\n -showInvisible 0\n -transitionFrames 1\n -opaqueContainers 0\n -freeform 0\n -imagePosition 0 0 \n -imageScale 1\n -imageEnabled 0\n -graphType \"DAG\" \n"
- + " -heatMapDisplay 0\n -updateSelection 1\n -updateNodeAdded 1\n -useDrawOverrideColor 0\n -limitGraphTraversal -1\n -range 0 0 \n -iconSize \"smallIcons\" \n -showCachedConnections 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperShadePanel\" (localizedPanelLabel(\"Hypershade\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypershade\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"visorPanel\" (localizedPanelLabel(\"Visor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Visor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n"
- + "\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"nodeEditorPanel\" (localizedPanelLabel(\"Node Editor\")) `;\n\tif ($nodeEditorPanelVisible || $nodeEditorWorkspaceControlOpen) {\n\t\tif (\"\" == $panelName) {\n\t\t\tif ($useSceneConfig) {\n\t\t\t\t$panelName = `scriptedPanel -unParent -type \"nodeEditorPanel\" -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels `;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n -additiveGraphingMode 0\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n"
- + " -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\t}\n\t\t} else {\n\t\t\t$label = `panel -q -label $panelName`;\n\t\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n"
- + " -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n -additiveGraphingMode 0\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\tif (!$useSceneConfig) {\n\t\t\t\tpanel -e -l $label $panelName;\n\t\t\t}\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"createNodePanel\" (localizedPanelLabel(\"Create Node\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Create Node\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"polyTexturePlacementPanel\" (localizedPanelLabel(\"UV Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"UV Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"renderWindowPanel\" (localizedPanelLabel(\"Render View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Render View\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"shapePanel\" (localizedPanelLabel(\"Shape Editor\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tshapePanel -edit -l (localizedPanelLabel(\"Shape Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"posePanel\" (localizedPanelLabel(\"Pose Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tposePanel -edit -l (localizedPanelLabel(\"Pose Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynRelEdPanel\" (localizedPanelLabel(\"Dynamic Relationships\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dynamic Relationships\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"relationshipPanel\" (localizedPanelLabel(\"Relationship Editor\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Relationship Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"referenceEditorPanel\" (localizedPanelLabel(\"Reference Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Reference Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"componentEditorPanel\" (localizedPanelLabel(\"Component Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Component Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynPaintScriptedPanelType\" (localizedPanelLabel(\"Paint Effects\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Paint Effects\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"scriptEditorPanel\" (localizedPanelLabel(\"Script Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Script Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"profilerPanel\" (localizedPanelLabel(\"Profiler Tool\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Profiler Tool\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"contentBrowserPanel\" (localizedPanelLabel(\"Content Browser\")) `;\n"
- + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Content Browser\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"Stereo\" (localizedPanelLabel(\"Stereo\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Stereo\")) -mbv $menusOkayInPanels $panelName;\n{ string $editorName = ($panelName+\"Editor\");\n stereoCameraView -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"wireframe\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 1\n"
- + " -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 16384\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 4 4 \n -bumpResolution 4 4 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n"
- + " -lowQualityLighting 0\n -maximumNumHardwareLights 0\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n"
- + " -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -greasePencils 1\n -shadows 0\n -captureSequenceNumber -1\n -width 0\n -height 0\n -sceneRenderFilter 0\n -displayMode \"centerEye\" \n -viewColor 0 0 0 1 \n -useCustomBackground 1\n $editorName;\n stereoCameraView -e -viewSelected 0 $editorName;\n stereoCameraView -e \n -pluginObjects \"gpuCacheDisplayFilter\" 1 \n $editorName; };\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\tif ($useSceneConfig) {\n string $configName = `getPanel -cwl (localizedPanelLabel(\"Current Layout\"))`;\n"
- + " if (\"\" != $configName) {\n\t\t\tpanelConfiguration -edit -label (localizedPanelLabel(\"Current Layout\")) \n\t\t\t\t-userCreated false\n\t\t\t\t-defaultImage \"vacantCell.xP:/\"\n\t\t\t\t-image \"\"\n\t\t\t\t-sc false\n\t\t\t\t-configString \"global string $gMainPane; paneLayout -e -cn \\\"single\\\" -ps 1 100 100 $gMainPane;\"\n\t\t\t\t-removeAllPanels\n\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Persp View\")) \n\t\t\t\t\t\"modelPanel\"\n"
- + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 16384\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -greasePencils 1\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 1312\\n -height 732\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName;\\nmodelEditor -e \\n -pluginObjects \\\"gpuCacheDisplayFilter\\\" 1 \\n $editorName\"\n"
- + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 16384\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -greasePencils 1\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 1312\\n -height 732\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName;\\nmodelEditor -e \\n -pluginObjects \\\"gpuCacheDisplayFilter\\\" 1 \\n $editorName\"\n"
+ + " -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 477\n -height 276\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Side View\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Side View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|side\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n"
+ + " -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n"
+ + " -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 476\n -height 276\n -sceneRenderFilter 0\n $editorName;\n"
+ + " modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Front View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Front View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|front\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n"
+ + " -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n"
+ + " -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n"
+ + " -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 477\n -height 276\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Persp View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Persp View\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n modelEditor -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"smoothShaded\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n"
+ + " -twoSidedLighting 0\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -rendererName \"vp2Renderer\" \n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 256 256 \n -bumpResolution 512 512 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n"
+ + " -maximumNumHardwareLights 1\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n"
+ + " -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 476\n -height 276\n -sceneRenderFilter 0\n $editorName;\n modelEditor -e -viewSelected 0 $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"ToggledOutliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"ToggledOutliner\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n outlinerEditor -e \n -docTag \"isolOutln_fromSeln\" \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 1\n -showReferenceMembers 1\n"
+ + " -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n"
+ + " -isSet 0\n -isSetMember 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -selectCommand \"print(\\\"\\\")\" \n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n -renderFilterIndex 0\n -selectionOrder \"chronological\" \n -expandAttribute 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"Outliner\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"Outliner\")) -mbv $menusOkayInPanels $panelName;\n\t\t$editorName = $panelName;\n outlinerEditor -e \n -showShapes 0\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 0\n -showConnected 0\n -showAnimCurvesOnly 0\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 1\n -showAssets 1\n -showContainedOnly 1\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 1\n -ignoreDagHierarchy 0\n -expandConnections 0\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 1\n -showLeafs 1\n"
+ + " -showNumericAttrsOnly 0\n -highlightActive 1\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"defaultSetFilter\" \n -showSetMembers 1\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 0\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n"
+ + " $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"graphEditor\" (localizedPanelLabel(\"Graph Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Graph Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 1\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n"
+ + " -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 1\n -showCompounds 0\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 1\n -doNotSelectNewObjects 0\n -dropIsParent 1\n -transmitFilters 1\n -setFilter \"0\" \n -showSetMembers 0\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n"
+ + " -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 1\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"GraphEd\");\n animCurveEditor -e \n -displayValues 0\n -snapTime \"integer\" \n -snapValue \"none\" \n -showPlayRangeShades \"on\" \n -lockPlayRangeShades \"off\" \n -smoothness \"fine\" \n -resultSamples 1.041667\n -resultScreenSamples 0\n -resultUpdate \"delayed\" \n -showUpstreamCurves 1\n -keyMinScale 1\n -stackedCurvesMin -1\n -stackedCurvesMax 1\n"
+ + " -stackedCurvesSpace 0.2\n -preSelectionHighlight 0\n -constrainDrag 0\n -valueLinesToggle 1\n -highlightAffectedCurves 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dopeSheetPanel\" (localizedPanelLabel(\"Dope Sheet\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dope Sheet\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n outlinerEditor -e \n -showShapes 1\n -showAssignedMaterials 0\n -showTimeEditor 1\n -showReferenceNodes 0\n -showReferenceMembers 0\n -showAttributes 1\n -showConnected 1\n -showAnimCurvesOnly 1\n -showMuteInfo 0\n -organizeByLayer 1\n -organizeByClip 1\n"
+ + " -showAnimLayerWeight 1\n -autoExpandLayers 1\n -autoExpand 0\n -showDagOnly 0\n -showAssets 1\n -showContainedOnly 0\n -showPublishedAsConnected 0\n -showParentContainers 0\n -showContainerContents 0\n -ignoreDagHierarchy 0\n -expandConnections 1\n -showUpstreamCurves 1\n -showUnitlessCurves 0\n -showCompounds 1\n -showLeafs 1\n -showNumericAttrsOnly 1\n -highlightActive 0\n -autoSelectNewObjects 0\n -doNotSelectNewObjects 1\n -dropIsParent 1\n -transmitFilters 0\n -setFilter \"0\" \n -showSetMembers 0\n -allowMultiSelection 1\n -alwaysToggleSelect 0\n -directSelect 0\n -showUfeItems 1\n -displayMode \"DAG\" \n -expandObjects 0\n"
+ + " -setsIgnoreFilters 1\n -containersIgnoreFilters 0\n -editAttrName 0\n -showAttrValues 0\n -highlightSecondary 0\n -showUVAttrsOnly 0\n -showTextureNodesOnly 0\n -attrAlphaOrder \"default\" \n -animLayerFilterOptions \"allAffecting\" \n -sortOrder \"none\" \n -longNames 0\n -niceNames 1\n -showNamespace 1\n -showPinIcons 0\n -mapMotionTrails 1\n -ignoreHiddenAttribute 0\n -ignoreOutlinerColor 0\n -renderFilterVisible 0\n $editorName;\n\n\t\t\t$editorName = ($panelName+\"DopeSheetEd\");\n dopeSheetEditor -e \n -displayValues 0\n -snapTime \"integer\" \n -snapValue \"none\" \n -outliner \"dopeSheetPanel1OutlineEd\" \n -showSummary 1\n -showScene 0\n -hierarchyBelow 0\n"
+ + " -showTicks 1\n -selectionWindow 0 0 0 0 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"timeEditorPanel\" (localizedPanelLabel(\"Time Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Time Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"clipEditorPanel\" (localizedPanelLabel(\"Trax Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Trax Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = clipEditorNameFromPanel($panelName);\n clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 0 \n"
+ + " $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"sequenceEditorPanel\" (localizedPanelLabel(\"Camera Sequencer\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Camera Sequencer\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = sequenceEditorNameFromPanel($panelName);\n clipEditor -e \n -displayValues 0\n -snapTime \"none\" \n -snapValue \"none\" \n -initialized 0\n -manageSequencer 1 \n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperGraphPanel\" (localizedPanelLabel(\"Hypergraph Hierarchy\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypergraph Hierarchy\")) -mbv $menusOkayInPanels $panelName;\n"
+ + "\n\t\t\t$editorName = ($panelName+\"HyperGraphEd\");\n hyperGraph -e \n -graphLayoutStyle \"hierarchicalLayout\" \n -orientation \"horiz\" \n -mergeConnections 0\n -zoom 1\n -animateTransition 0\n -showRelationships 1\n -showShapes 0\n -showDeformers 0\n -showExpressions 0\n -showConstraints 0\n -showConnectionFromSelected 0\n -showConnectionToSelected 0\n -showConstraintLabels 0\n -showUnderworld 0\n -showInvisible 0\n -transitionFrames 1\n -opaqueContainers 0\n -freeform 0\n -imagePosition 0 0 \n -imageScale 1\n -imageEnabled 0\n -graphType \"DAG\" \n -heatMapDisplay 0\n -updateSelection 1\n -updateNodeAdded 1\n -useDrawOverrideColor 0\n -limitGraphTraversal -1\n"
+ + " -range 0 0 \n -iconSize \"smallIcons\" \n -showCachedConnections 0\n $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperShadePanel\" (localizedPanelLabel(\"Hypershade\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypershade\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"visorPanel\" (localizedPanelLabel(\"Visor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Visor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"nodeEditorPanel\" (localizedPanelLabel(\"Node Editor\")) `;\n\tif ($nodeEditorPanelVisible || $nodeEditorWorkspaceControlOpen) {\n"
+ + "\t\tif (\"\" == $panelName) {\n\t\t\tif ($useSceneConfig) {\n\t\t\t\t$panelName = `scriptedPanel -unParent -type \"nodeEditorPanel\" -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels `;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n -additiveGraphingMode 1\n -connectedGraphingMode 1\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n"
+ + " -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -showUnitConversions 0\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\t}\n\t\t} else {\n\t\t\t$label = `panel -q -label $panelName`;\n\t\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels $panelName;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n nodeEditor -e \n -allAttributes 0\n -allNodes 0\n -autoSizeNodes 1\n -consistentNameSize 1\n -createNodeCommand \"nodeEdCreateNodeCommand\" \n -connectNodeOnCreation 0\n -connectOnDrop 0\n -copyConnectionsOnPaste 0\n -connectionStyle \"bezier\" \n -defaultPinnedState 0\n"
+ + " -additiveGraphingMode 1\n -connectedGraphingMode 1\n -settingsChangedCallback \"nodeEdSyncControls\" \n -traversalDepthLimit -1\n -keyPressCommand \"nodeEdKeyPressCommand\" \n -nodeTitleMode \"name\" \n -gridSnap 0\n -gridVisibility 1\n -crosshairOnEdgeDragging 0\n -popupMenuScript \"nodeEdBuildPanelMenus\" \n -showNamespace 1\n -showShapes 1\n -showSGShapes 0\n -showTransforms 1\n -useAssets 1\n -syncedSelection 1\n -extendToShapes 1\n -showUnitConversions 0\n -editorMode \"default\" \n -hasWatchpoint 0\n $editorName;\n\t\t\tif (!$useSceneConfig) {\n\t\t\t\tpanel -e -l $label $panelName;\n\t\t\t}\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"createNodePanel\" (localizedPanelLabel(\"Create Node\")) `;\n\tif (\"\" != $panelName) {\n"
+ + "\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Create Node\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"polyTexturePlacementPanel\" (localizedPanelLabel(\"UV Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"UV Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"renderWindowPanel\" (localizedPanelLabel(\"Render View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Render View\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"shapePanel\" (localizedPanelLabel(\"Shape Editor\")) `;\n\tif (\"\" != $panelName) {\n"
+ + "\t\t$label = `panel -q -label $panelName`;\n\t\tshapePanel -edit -l (localizedPanelLabel(\"Shape Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"posePanel\" (localizedPanelLabel(\"Pose Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tposePanel -edit -l (localizedPanelLabel(\"Pose Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynRelEdPanel\" (localizedPanelLabel(\"Dynamic Relationships\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dynamic Relationships\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"relationshipPanel\" (localizedPanelLabel(\"Relationship Editor\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Relationship Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"referenceEditorPanel\" (localizedPanelLabel(\"Reference Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Reference Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynPaintScriptedPanelType\" (localizedPanelLabel(\"Paint Effects\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Paint Effects\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"scriptEditorPanel\" (localizedPanelLabel(\"Script Editor\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Script Editor\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"profilerPanel\" (localizedPanelLabel(\"Profiler Tool\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Profiler Tool\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"contentBrowserPanel\" (localizedPanelLabel(\"Content Browser\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Content Browser\")) -mbv $menusOkayInPanels $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"Stereo\" (localizedPanelLabel(\"Stereo\")) `;\n"
+ + "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Stereo\")) -mbv $menusOkayInPanels $panelName;\n{ string $editorName = ($panelName+\"Editor\");\n stereoCameraView -e \n -camera \"|persp\" \n -useInteractiveMode 0\n -displayLights \"default\" \n -displayAppearance \"wireframe\" \n -activeOnly 0\n -ignorePanZoom 0\n -wireframeOnShaded 0\n -headsUpDisplay 1\n -holdOuts 1\n -selectionHiliteDisplay 1\n -useDefaultMaterial 0\n -bufferMode \"double\" \n -twoSidedLighting 1\n -backfaceCulling 0\n -xray 0\n -jointXray 0\n -activeComponentsXray 0\n -displayTextures 0\n -smoothWireframe 0\n -lineWidth 1\n -textureAnisotropic 0\n -textureHilight 1\n -textureSampling 2\n"
+ + " -textureDisplay \"modulate\" \n -textureMaxSize 32768\n -fogging 0\n -fogSource \"fragment\" \n -fogMode \"linear\" \n -fogStart 0\n -fogEnd 100\n -fogDensity 0.1\n -fogColor 0.5 0.5 0.5 1 \n -depthOfFieldPreview 1\n -maxConstantTransparency 1\n -objectFilterShowInHUD 1\n -isFiltered 0\n -colorResolution 4 4 \n -bumpResolution 4 4 \n -textureCompression 0\n -transparencyAlgorithm \"frontAndBackCull\" \n -transpInShadows 0\n -cullingOverride \"none\" \n -lowQualityLighting 0\n -maximumNumHardwareLights 0\n -occlusionCulling 0\n -shadingModel 0\n -useBaseRenderer 0\n -useReducedRenderer 0\n -smallObjectCulling 0\n -smallObjectThreshold -1 \n -interactiveDisableShadows 0\n"
+ + " -interactiveBackFaceCull 0\n -sortTransparent 1\n -controllers 1\n -nurbsCurves 1\n -nurbsSurfaces 1\n -polymeshes 1\n -subdivSurfaces 1\n -planes 1\n -lights 1\n -cameras 1\n -controlVertices 1\n -hulls 1\n -grid 1\n -imagePlane 1\n -joints 1\n -ikHandles 1\n -deformers 1\n -dynamics 1\n -particleInstancers 1\n -fluids 1\n -hairSystems 1\n -follicles 1\n -nCloths 1\n -nParticles 1\n -nRigids 1\n -dynamicConstraints 1\n -locators 1\n -manipulators 1\n -pluginShapes 1\n -dimensions 1\n -handles 1\n -pivots 1\n -textures 1\n -strokes 1\n -motionTrails 1\n"
+ + " -clipGhosts 1\n -bluePencil 1\n -greasePencils 0\n -shadows 0\n -captureSequenceNumber -1\n -width 0\n -height 0\n -sceneRenderFilter 0\n -displayMode \"centerEye\" \n -viewColor 0 0 0 1 \n -useCustomBackground 1\n $editorName;\n stereoCameraView -e -viewSelected 0 $editorName; };\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\tif ($useSceneConfig) {\n string $configName = `getPanel -cwl (localizedPanelLabel(\"Current Layout\"))`;\n if (\"\" != $configName) {\n\t\t\tpanelConfiguration -edit -label (localizedPanelLabel(\"Current Layout\")) \n\t\t\t\t-userCreated false\n\t\t\t\t-defaultImage \"vacantCell.xP:/\"\n\t\t\t\t-image \"\"\n\t\t\t\t-sc false\n\t\t\t\t-configString \"global string $gMainPane; paneLayout -e -cn \\\"quad\\\" -ps 1 50 50 -ps 2 50 50 -ps 3 50 50 -ps 4 50 50 $gMainPane;\"\n\t\t\t\t-removeAllPanels\n\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Top View\")) \n"
+ + "\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Top View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|top\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Top View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|top\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Persp View\")) \n\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera persp` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Side View\")) \n\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Side View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|side\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Side View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -camera \\\"|side\\\" \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 476\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Front View\")) \n\t\t\t\t\t\"modelPanel\"\n"
+ + "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Front View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera front` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ + "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Front View\\\")) -mbv $menusOkayInPanels $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n -cam `findStartUpCamera front` \\n -useInteractiveMode 0\\n -displayLights \\\"default\\\" \\n -displayAppearance \\\"smoothShaded\\\" \\n -activeOnly 0\\n -ignorePanZoom 0\\n -wireframeOnShaded 0\\n -headsUpDisplay 1\\n -holdOuts 1\\n -selectionHiliteDisplay 1\\n -useDefaultMaterial 0\\n -bufferMode \\\"double\\\" \\n -twoSidedLighting 0\\n -backfaceCulling 0\\n -xray 0\\n -jointXray 0\\n -activeComponentsXray 0\\n -displayTextures 0\\n -smoothWireframe 0\\n -lineWidth 1\\n -textureAnisotropic 0\\n -textureHilight 1\\n -textureSampling 2\\n -textureDisplay \\\"modulate\\\" \\n -textureMaxSize 32768\\n -fogging 0\\n -fogSource \\\"fragment\\\" \\n -fogMode \\\"linear\\\" \\n -fogStart 0\\n -fogEnd 100\\n -fogDensity 0.1\\n -fogColor 0.5 0.5 0.5 1 \\n -depthOfFieldPreview 1\\n -maxConstantTransparency 1\\n -rendererName \\\"vp2Renderer\\\" \\n -objectFilterShowInHUD 1\\n -isFiltered 0\\n -colorResolution 256 256 \\n -bumpResolution 512 512 \\n -textureCompression 0\\n -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n -transpInShadows 0\\n -cullingOverride \\\"none\\\" \\n -lowQualityLighting 0\\n -maximumNumHardwareLights 1\\n -occlusionCulling 0\\n -shadingModel 0\\n -useBaseRenderer 0\\n -useReducedRenderer 0\\n -smallObjectCulling 0\\n -smallObjectThreshold -1 \\n -interactiveDisableShadows 0\\n -interactiveBackFaceCull 0\\n -sortTransparent 1\\n -controllers 1\\n -nurbsCurves 1\\n -nurbsSurfaces 1\\n -polymeshes 1\\n -subdivSurfaces 1\\n -planes 1\\n -lights 1\\n -cameras 1\\n -controlVertices 1\\n -hulls 1\\n -grid 1\\n -imagePlane 1\\n -joints 1\\n -ikHandles 1\\n -deformers 1\\n -dynamics 1\\n -particleInstancers 1\\n -fluids 1\\n -hairSystems 1\\n -follicles 1\\n -nCloths 1\\n -nParticles 1\\n -nRigids 1\\n -dynamicConstraints 1\\n -locators 1\\n -manipulators 1\\n -pluginShapes 1\\n -dimensions 1\\n -handles 1\\n -pivots 1\\n -textures 1\\n -strokes 1\\n -motionTrails 1\\n -clipGhosts 1\\n -bluePencil 1\\n -greasePencils 0\\n -shadows 0\\n -captureSequenceNumber -1\\n -width 477\\n -height 276\\n -sceneRenderFilter 0\\n $editorName;\\nmodelEditor -e -viewSelected 0 $editorName\"\n"
+ "\t\t\t\t$configName;\n\n setNamedPanelLayout (localizedPanelLabel(\"Current Layout\"));\n }\n\n panelHistory -e -clear mainPanelHistory;\n sceneUIReplacement -clear;\n\t}\n\n\ngrid -spacing 5 -size 12 -divisions 5 -displayAxes yes -displayGridLines yes -displayDivisionLines yes -displayPerspectiveLabels no -displayOrthographicLabels no -displayAxesBold yes -perspectiveLabelPosition axis -orthographicLabelPosition edge;\nviewManip -drawCompass 0 -compassAngle 0 -frontParameters \"\" -homeParameters \"\" -selectionLockParameters \"\";\n}\n");
setAttr ".st" 3;
createNode script -n "sceneConfigurationScriptNode";
@@ -273,6 +285,7 @@ createNode aiAOVDriver -s -n "defaultArnoldDisplayDriver";
createNode objectSet -n "workfileMain";
rename -uid "3C9B5D6F-4579-8E3B-5B7D-4C88865A1C68";
addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
+ addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "id" -ln "id" -dt "string";
addAttr -ci true -sn "family" -ln "family" -dt "string";
addAttr -ci true -sn "subset" -ln "subset" -dt "string";
@@ -281,13 +294,14 @@ createNode objectSet -n "workfileMain";
addAttr -ci true -sn "variant" -ln "variant" -dt "string";
addAttr -ci true -sn "asset" -ln "asset" -dt "string";
addAttr -ci true -sn "task" -ln "task" -dt "string";
- addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
- addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
+ addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
+ addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
-dt "string";
setAttr ".ihi" 0;
setAttr ".hio" yes;
setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:30d256dac64c";
+ setAttr ".instance_id" -type "string" "911dc92a-ad29-41e5-bbf9-733d56174fb9";
setAttr ".id" -type "string" "pyblish.avalon.instance";
setAttr ".family" -type "string" "workfile";
setAttr ".subset" -type "string" "workfileTest_task";
@@ -296,16 +310,9 @@ createNode objectSet -n "workfileMain";
setAttr ".variant" -type "string" "Main";
setAttr ".asset" -type "string" "test_asset";
setAttr ".task" -type "string" "test_task";
- setAttr ".instance_id" -type "string" "911dc92a-ad29-41e5-bbf9-733d56174fb9";
- setAttr ".publish_attributes" -type "string" "{\"ExtractImportReference\": {\"active\": false}}";
+ setAttr ".publish_attributes" -type "string" "{\"ValidateInstanceInContext\": {\"active\": true}, \"ExtractImportReference\": {\"active\": false}}";
+ setAttr ".creator_attributes" -type "string" "{}";
setAttr ".__creator_attributes_keys" -type "string" "";
-createNode objectSet -n "renderingMain";
- rename -uid "8A999C2F-4922-B15D-8D5C-45A16465B69F";
- addAttr -ci true -sn "pre_creator_identifier" -ln "pre_creator_identifier" -dt "string";
- addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
- setAttr ".ihi" 0;
- setAttr ".pre_creator_identifier" -type "string" "io.openpype.creators.maya.renderlayer";
- setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:042447475732";
createNode renderSetupLayer -n "Main";
rename -uid "2202E438-4CEF-F64E-737C-F48C65E31126";
addAttr -ci true -sn "es" -ln "expandedState" -min 0 -max 1 -at "bool";
@@ -320,55 +327,6 @@ createNode collection -n "defaultCollection";
createNode simpleSelector -n "defaultCollectionSelector";
rename -uid "7CA2F6D8-483C-B020-BC03-EF9563A52163";
setAttr ".pat" -type "string" "*";
-createNode objectSet -n "_renderingMain:Main";
- rename -uid "1EEC3A3B-49CF-0C79-5340-39805174FB8A";
- addAttr -s false -ci true -sn "renderlayer" -ln "renderlayer" -at "message";
- addAttr -ci true -sn "id" -ln "id" -dt "string";
- addAttr -ci true -sn "family" -ln "family" -dt "string";
- addAttr -ci true -sn "subset" -ln "subset" -dt "string";
- addAttr -ci true -sn "active" -ln "active" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "creator_identifier" -ln "creator_identifier" -dt "string";
- addAttr -ci true -sn "variant" -ln "variant" -dt "string";
- addAttr -ci true -sn "asset" -ln "asset" -dt "string";
- addAttr -ci true -sn "task" -ln "task" -dt "string";
- addAttr -ci true -sn "instance_id" -ln "instance_id" -dt "string";
- addAttr -ci true -sn "review" -ln "review" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "extendFrames" -ln "extendFrames" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "overrideExistingFrame" -ln "overrideExistingFrame" -min 0
- -max 1 -at "bool";
- addAttr -ci true -sn "tileRendering" -ln "tileRendering" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "tilesX" -ln "tilesX" -at "long";
- addAttr -ci true -sn "tilesY" -ln "tilesY" -at "long";
- addAttr -ci true -sn "convertToScanline" -ln "convertToScanline" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "useReferencedAovs" -ln "useReferencedAovs" -min 0 -max 1 -at "bool";
- addAttr -ci true -sn "renderSetupIncludeLights" -ln "renderSetupIncludeLights" -min
- 0 -max 1 -at "bool";
- addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
- addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
- -dt "string";
- addAttr -ci true -sn "cbId" -ln "cbId" -dt "string";
- setAttr ".ihi" 0;
- setAttr ".id" -type "string" "pyblish.avalon.instance";
- setAttr ".family" -type "string" "renderlayer";
- setAttr ".subset" -type "string" "renderMain";
- setAttr -cb on ".active" yes;
- setAttr ".creator_identifier" -type "string" "io.openpype.creators.maya.renderlayer";
- setAttr ".variant" -type "string" "Main";
- setAttr ".asset" -type "string" "test_asset";
- setAttr ".task" -type "string" "test_task";
- setAttr ".instance_id" -type "string" "8a9cfb85-9602-4e5e-a4bc-27a2986bae7f";
- setAttr -cb on ".review" yes;
- setAttr -cb on ".extendFrames";
- setAttr -cb on ".overrideExistingFrame" yes;
- setAttr -cb on ".tileRendering";
- setAttr -cb on ".tilesX" 2;
- setAttr -cb on ".tilesY" 2;
- setAttr -cb on ".convertToScanline";
- setAttr -cb on ".useReferencedAovs";
- setAttr -cb on ".renderSetupIncludeLights" yes;
- setAttr ".publish_attributes" -type "string" "{\"CollectDeadlinePools\": {\"primaryPool\": \"\", \"secondaryPool\": \"\"}, \"ValidateDeadlinePools\": {\"active\": true}, \"ValidateFrameRange\": {\"active\": true}, \"ExtractImportReference\": {\"active\": false}, \"MayaSubmitDeadline\": {\"priority\": 50, \"chunkSize\": 1, \"machineList\": \"\", \"whitelist\": false, \"tile_priority\": 50, \"strict_error_checking\": true}, \"ProcessSubmittedJobOnFarm\": {\"publishJobState\": \"Active\"}}";
- setAttr ".__creator_attributes_keys" -type "string" "review,extendFrames,overrideExistingFrame,tileRendering,tilesX,tilesY,convertToScanline,useReferencedAovs,renderSetupIncludeLights";
- setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:69960f336351";
select -ne :time1;
setAttr ".o" 1001;
setAttr ".unw" 1001;
@@ -435,8 +393,6 @@ select -ne :defaultColorMgtGlobals;
select -ne :hardwareRenderGlobals;
setAttr ".ctrs" 256;
setAttr ".btrs" 512;
-select -ne :ikSystem;
- setAttr -s 4 ".sol";
connectAttr "rs_Main.ri" ":persp.rlio[0]";
connectAttr "rs_Main.ri" ":top.rlio[0]";
connectAttr "rs_Main.ri" ":front.rlio[0]";
@@ -459,7 +415,6 @@ connectAttr ":defaultArnoldDisplayDriver.msg" ":defaultArnoldRenderOptions.drive
-na;
connectAttr ":defaultArnoldFilter.msg" ":defaultArnoldRenderOptions.filt";
connectAttr ":defaultArnoldDriver.msg" ":defaultArnoldRenderOptions.drvr";
-connectAttr "_renderingMain:Main.msg" "renderingMain.dnsm" -na;
connectAttr "rs_Main.msg" "Main.lrl";
connectAttr "renderSetup.lit" "Main.pls";
connectAttr "defaultCollection.msg" "Main.cl";
@@ -468,9 +423,8 @@ connectAttr "renderLayerManager.rlmi[1]" "rs_Main.rlid";
connectAttr "defaultCollectionSelector.c" "defaultCollection.sel";
connectAttr "Main.lit" "defaultCollection.pls";
connectAttr "Main.nic" "defaultCollection.pic";
-connectAttr "Main.msg" "_renderingMain:Main.renderlayer";
connectAttr "defaultRenderLayer.msg" ":defaultRenderingList1.r" -na;
connectAttr "rs_Main.msg" ":defaultRenderingList1.r" -na;
connectAttr "pSphere1_GEOShape1.iog" ":initialShadingGroup.dsm" -na;
connectAttr "pDiscShape1.iog" ":initialShadingGroup.dsm" -na;
-// End of test_project_test_asset_test_task_v001.ma
+// End of test_project_test_asset_test_task_v002.ma
diff --git a/tests/integration/hosts/nuke/test_deadline_publish_in_nuke.py b/tests/integration/hosts/nuke/test_deadline_publish_in_nuke.py
index a4026f195b..586078ead6 100644
--- a/tests/integration/hosts/nuke/test_deadline_publish_in_nuke.py
+++ b/tests/integration/hosts/nuke/test_deadline_publish_in_nuke.py
@@ -69,7 +69,7 @@ class TestDeadlinePublishInNuke(NukeDeadlinePublishTestClass):
name="workfileTest_task"))
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 4))
+ DBAssert.count_of_types(dbcon, "representation", 3))
additional_args = {"context.subset": "workfileTest_task",
"context.ext": "nk"}
@@ -86,7 +86,7 @@ class TestDeadlinePublishInNuke(NukeDeadlinePublishTestClass):
additional_args = {"context.subset": "renderTest_taskMain",
"name": "thumbnail"}
failures.append(
- DBAssert.count_of_types(dbcon, "representation", 1,
+ DBAssert.count_of_types(dbcon, "representation", 0,
additional_args=additional_args))
additional_args = {"context.subset": "renderTest_taskMain",
diff --git a/tests/lib/db_handler.py b/tests/lib/db_handler.py
index 82e741cc3b..d9a52be5b4 100644
--- a/tests/lib/db_handler.py
+++ b/tests/lib/db_handler.py
@@ -2,7 +2,7 @@
Helper class for automatic testing, provides dump and restore via command
line utilities.
- Expect mongodump, mongoimport and mongorestore present at PATH
+ Expect mongodump, mongoexport, mongoimport and mongorestore present at PATH
"""
import os
import pymongo
@@ -148,7 +148,7 @@ class DBHandler:
self.client.drop_database(db_name)
def backup_to_dump(self, db_name, dump_dir, overwrite=False,
- collection=None):
+ collection=None, format="bson"):
"""
Helper method for running mongodump for specific 'db_name'
"""
@@ -160,15 +160,24 @@ class DBHandler:
raise RuntimeError("Backup already exists, "
"run with overwrite=True")
- query = self._dump_query(self.uri, dump_dir,
- db_name=db_name, collection=collection)
- print("Mongodump query:: {}".format(query))
- subprocess.run(query)
+ collections = [collection]
+ if format == "json" and collection is None:
+ collections = self.client[db_name].list_collection_names()
+
+ for collection in collections:
+ query = self._dump_query(self.uri, dump_dir,
+ db_name=db_name, collection=collection,
+ format=format)
+ print("Mongodump query:: {}".format(query))
+ process = subprocess.run(query)
+ assert process.returncode == 0, "Mongo dump failed."
def _db_exists(self, db_name):
return db_name in self.client.list_database_names()
- def _dump_query(self, uri, output_path, db_name=None, collection=None):
+ def _dump_query(
+ self, uri, output_path, db_name=None, collection=None, format="bson"
+ ):
"""Prepares dump query based on 'db_name' or 'collection'."""
db_part = coll_part = ""
if db_name:
@@ -177,11 +186,22 @@ class DBHandler:
if not db_name:
raise ValueError("db_name must be present")
coll_part = "--collection={}".format(collection)
- query = "\"{}\" --uri=\"{}\" --out={} {} {}".format(
- "mongodump", uri, output_path, db_part, coll_part
- )
- return query
+ tool = "mongodump"
+ query = "{} --uri=\"{}\""
+
+ if format == "json":
+ assert collection, "Collection is needed for json export."
+
+ query += " --jsonArray --pretty"
+ tool = "mongoexport"
+ output_path = os.path.join(
+ output_path, "{}.{}.json".format(db_name, collection)
+ )
+
+ query += " --out={} {} {}"
+
+ return query.format(tool, uri, output_path, db_part, coll_part)
def _restore_query(self, uri, dump_dir,
db_name=None, db_name_out=None,
diff --git a/tests/lib/testing_classes.py b/tests/lib/testing_classes.py
index 7700381aa6..ade38d60c8 100644
--- a/tests/lib/testing_classes.py
+++ b/tests/lib/testing_classes.py
@@ -70,7 +70,9 @@ class ModuleUnitTest(BaseTest):
)
@pytest.fixture(scope="module")
- def download_test_data(self, test_data_folder, persist, request):
+ def download_test_data(
+ self, test_data_folder, persist, request, dump_databases
+ ):
test_data_folder = test_data_folder or self.TEST_DATA_FOLDER
if test_data_folder:
print("Using existing folder {}".format(test_data_folder))
@@ -100,13 +102,13 @@ class ModuleUnitTest(BaseTest):
if ext and ext.lstrip('.') in handler_class.IMPLEMENTED_ZIP_FORMATS: # noqa: E501
handler_class.unzip(os.path.join(tmpdir, file_name))
- yield tmpdir
+ yield tmpdir
- persist = (persist or self.PERSIST or
- self.is_test_failed(request))
- if not persist:
- print("Removing {}".format(tmpdir))
- shutil.rmtree(tmpdir)
+ persist = (persist or self.PERSIST or
+ self.is_test_failed(request) or dump_databases)
+ if not persist:
+ print("Removing {}".format(tmpdir))
+ shutil.rmtree(tmpdir)
@pytest.fixture(scope="module")
def output_folder_url(self, download_test_data):
@@ -163,7 +165,7 @@ class ModuleUnitTest(BaseTest):
@pytest.fixture(scope="module")
def db_setup(self, download_test_data, env_var, monkeypatch_session,
- request, mongo_url):
+ request, mongo_url, dump_databases, persist):
"""Restore prepared MongoDB dumps into selected DB."""
backup_dir = os.path.join(download_test_data, "input", "dumps")
uri = os.environ.get("OPENPYPE_MONGO")
@@ -178,7 +180,17 @@ class ModuleUnitTest(BaseTest):
yield db_handler
- persist = self.PERSIST or self.is_test_failed(request)
+ if dump_databases:
+ print("Dumping databases to {}".format(download_test_data))
+ output_dir = os.path.join(download_test_data, "output", "dumps")
+ db_handler.backup_to_dump(
+ self.TEST_DB_NAME, output_dir, format=dump_databases
+ )
+ db_handler.backup_to_dump(
+ self.TEST_OPENPYPE_NAME, output_dir, format=dump_databases
+ )
+
+ persist = persist or self.PERSIST or self.is_test_failed(request)
if not persist:
db_handler.teardown(self.TEST_DB_NAME)
db_handler.teardown(self.TEST_OPENPYPE_NAME)
@@ -469,7 +481,7 @@ class DeadlinePublishTest(PublishTest):
while not valid_date_finished:
time.sleep(0.5)
if time.time() - time_start > timeout:
- raise ValueError("Timeout for DL finish reached")
+ raise ValueError("Timeout for Deadline finish reached")
response = requests.get(url, timeout=10)
if not response.ok:
@@ -479,6 +491,61 @@ class DeadlinePublishTest(PublishTest):
if not response.json():
raise ValueError("Couldn't find {}".format(deadline_job_id))
+ job = response.json()[0]
+
+ def recursive_dependencies(job, results=None):
+ if results is None:
+ results = []
+
+ for dependency in job["Props"]["Dep"]:
+ dependency = requests.get(
+ "{}/api/jobs?JobId={}".format(
+ deadline_url, dependency["JobID"]
+ ),
+ timeout=10
+ ).json()[0]
+ results.append(dependency)
+ grand_dependencies = recursive_dependencies(
+ dependency, results=results
+ )
+ for grand_dependency in grand_dependencies:
+ if grand_dependency not in results:
+ results.append(grand_dependency)
+ return results
+
+ job_status = {
+ 0: "Unknown",
+ 1: "Active",
+ 2: "Suspended",
+ 3: "Completed",
+ 4: "Failed",
+ 6: "Pending"
+ }
+
+ jobs_to_validate = [job]
+ jobs_to_validate.extend(recursive_dependencies(job))
+ failed_jobs = []
+ errors = []
+ for job in jobs_to_validate:
+ if "Failed" == job_status[job["Stat"]]:
+ failed_jobs.append(str(job))
+
+ resp_error = requests.get(
+ "{}/api/jobreports?JobID={}&Data=allerrorcontents".format(
+ deadline_url, job["_id"]
+ ),
+ timeout=10
+ )
+ errors.extend(resp_error.json())
+
+ msg = "Errors in Deadline:\n"
+ msg += "\n".join(errors)
+ assert not errors, msg
+
+ msg = "Failed in Deadline:\n"
+ msg += "\n".join(failed_jobs)
+ assert not failed_jobs, msg
+
# '0001-...' returned until job is finished
valid_date_finished = response.json()[0]["DateComp"][:4] != "0001"