Commit graph

884 commits

Author SHA1 Message Date
Milan Kolar
f6723fa157
Merge pull request #5836 from BigRoy/chore/maya_remove_renderlayer_observers 2023-11-24 23:51:23 +01:00
Ondřej Samohel
c9a494876f
Merge branch 'develop' into bugfix/maya-cmds-mel-imports 2023-11-22 11:11:01 +01:00
Jakub Trllo
40a1dbed3e Merge branch 'develop' into feature/OP-7176_Use-folder-path-as-unique-identifier
# Conflicts:
#	openpype/hosts/blender/plugins/publish/extract_abc.py
#	openpype/hosts/blender/plugins/publish/extract_abc_animation.py
#	openpype/hosts/blender/plugins/publish/extract_blend.py
#	openpype/hosts/blender/plugins/publish/extract_blend_animation.py
#	openpype/hosts/blender/plugins/publish/extract_camera_abc.py
#	openpype/hosts/blender/plugins/publish/extract_camera_fbx.py
#	openpype/hosts/blender/plugins/publish/extract_fbx.py
#	openpype/hosts/blender/plugins/publish/extract_fbx_animation.py
#	openpype/hosts/blender/plugins/publish/extract_layout.py
2023-11-15 18:26:48 +01:00
Roy Nieterau
5d10f7f2dd
Remove global RENDER_ATTRS, refactor to a RenderSettings.get_padding_attr method (#5801)
- Partial cleanup extracted from #3880
2023-11-15 13:15:50 +01:00
Jakub Trllo
58fd1aa8e2 Merge branch 'develop' into feature/OP-7176_Use-folder-path-as-unique-identifier 2023-11-15 11:33:20 +01:00
Jakub Trllo
b382b7c776
Chore: Create plugin auto-apply settings (#5908)
* implemented default logic 'apply_settings' to auto-apply values

* added docstring to 'apply_settings'

* replace auto apply settings logic in maya

* add missing quote

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>

---------

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2023-11-14 14:57:53 +01:00
Jakub Trllo
a28d6d34d2 Merge branch 'develop' into feature/OP-7176_Use-folder-path-as-unique-identifier
# Conflicts:
#	openpype/client/server/entities.py
#	openpype/pipeline/context_tools.py
2023-11-13 16:39:09 +01:00
Kayla Man
c05aded1fa
Merge branch 'develop' into bugfix/fbx_animation_extraction_error_out_without_animated_skeleton 2023-11-10 16:04:38 +08:00
Ondrej Samohel
eaf3e1d3f8
🐛 fix broken imports
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.
2023-11-09 17:07:45 +01:00
Kayla Man
b3649b5c5c improve debug message & use debug instead of info for artist-facing report 2023-11-09 13:29:48 +08:00
Jakub Trllo
67bc4530da Merge branch 'develop' into feature/OP-7176_Use-folder-path-as-unique-identifier 2023-11-08 12:07:35 +01:00
Milan Kolar
17a884de07
Merge pull request #5781 from BigRoy/enhancement/maya_usd_reference_loader_to_native 2023-11-08 08:33:27 +01:00
Jakub Trllo
fc8342751d Merge branch 'develop' into feature/OP-7176_Use-folder-path-as-unique-identifier 2023-11-07 17:40:40 +01:00
Toke Jepsen
f7d76617c0
Testing: Validate Maya Logs (#5775)
* Working version

* Improve launched app communication

* Move imports to methods.

* Update tests/integration/hosts/maya/test_publish_in_maya.py

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>

* Collect errors from process

* fix startup scripts arguments

* Update openpype/lib/applications.py

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>

* Fix application polling

* Docstring

* Revert stdout and stderr

* Revert subprocess.PIPE

* Added missed imports

If we are moving these because of testing, lets move all of them

---------

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Co-authored-by: kalisp <petr.kalis@gmail.com>
2023-11-07 16:51:54 +01:00
Jakub Trllo
ff8cd30244 Merge branch 'develop' into feature/OP-7176_Use-folder-path-as-unique-identifier 2023-11-02 11:40:01 +01:00
Roy Nieterau
90c8922a8a Remove remaining unused function 2023-10-30 22:54:54 +01:00
Roy Nieterau
246c408ce7 Maya: Remove RenderSetup layer observers that are not needed since new publisher 2023-10-30 22:48:53 +01:00
Jakub Ježek
0cd38b3625
Merge branch 'develop' into bugfix/nuke_template_workfile 2023-10-30 12:33:23 +01:00
Jakub Trllo
a5056ea3fb modified maya to follow new usage of 'asset' value 2023-10-24 18:09:43 +02:00
Roy Nieterau
908b8e3fb6 Add MayaUsdReferenceLoader to reference USD as Maya native geometry using mayaUSDImport file translator 2023-10-17 12:22:01 +02:00
Ondrej Samohel
cffe48fc20
♻️ simplify the code 2023-10-16 09:57:22 +02:00
Ondrej Samohel
971164cd7f
🐛 don't call cmds.ogs() if in headless mode 2023-10-13 18:06:53 +02:00
Toke Stuart Jepsen
f3e02c1e95 Add MayaPy application 2023-10-05 15:05:18 +01:00
Ondřej Samohel
4a418c4c28
Merge pull request #5669 from BigRoy/chore/reduce_get_project_settings 2023-10-05 13:01:17 +02:00
Ondřej Samohel
4bcad094e2
Merge pull request #5490 from BigRoy/enhancement/publish_instances_uuid_from_host 2023-10-04 12:24:31 +02:00
Kayla
8b16bacb53 make sure the get_namespace won't error out if it doesn't get anything 2023-10-03 20:21:37 +08:00
Kayla
71838b0515 abstract relativeNames namesapces into function 2023-10-03 20:06:14 +08:00
Kayla
4330281688 small bugfix on collect skeleton mesh and minor tweak 2023-10-03 13:53:30 +08:00
Roy Nieterau
1eab27d710
Merge branch 'develop' into enhancement/publish_instances_uuid_from_host 2023-10-02 11:57:43 +02:00
Kayla
2850df81b9 fix the over-indented of the namespace function under context manager 2023-10-02 17:52:34 +08:00
Kayla
0ddf5ffd90 minor tweak & abstract some codes into functions in rig content 2023-10-02 12:29:41 +08:00
Kayla
7967e9b0b9 Merge branch 'develop' into enhancement/OP-6629_Maya-Export-Rig-Animation-as-FBX 2023-10-01 20:18:10 +08:00
Roy Nieterau
31e64d0ef8 Pass project settings to menu install so it doesn't need to also retrieve it 2023-09-30 13:25:55 +02:00
Roy Nieterau
b0a62e3afe Remove unused imports 2023-09-30 13:17:21 +02:00
Roy Nieterau
6d451ccd09 Use settings from apply_settings 2023-09-30 13:15:12 +02:00
Petr Kalis
a66edaf1d0
Maya: implement matchmove publishing (#5445)
* OP-6360 - allow export of multiple cameras as alembic

* OP-6360 - make validation of camera count optional

* OP-6360 - make ValidatorCameraContents optional

This validator checks number of cameras, without optionality publish wouldn't be possible.

* OP-6360 - allow extraction of multiple cameras to .ma

* OP-6360 - update defaults for Ayon

Changes to Ayon settings should also bump up version of addon.

* OP-6360 - new matchmove creator

This family should be for more complex sets (eg. multiple cameras, with geometry, planes etc.

* OP-6360 - updated camera extractors

Added matchmove family to extract multiple cameras.
Single camera is protected by required validator.

* OP-6360 - added matchmove to reference loader

* Revert "OP-6360 - make ValidatorCameraContents optional"

This reverts commit 4096e81f785b1299b54b1e485eb672403fb89a66.

* Revert "OP-6360 - update defaults for Ayon"

This reverts commit 4391b25cfc93fbb783146a726c6097477146c467.

* OP-6360 - performance update

Number of cameras might be quite large, set operations will be faster than loop.

* Revert "OP-6360 - make validation of camera count optional"

This reverts commit ee3d91a4cbec607b0f8cc9d47382684eba88d6d0.

* OP-6360 - explicitly cast to list for Maya functions

cmds.ls doesn't like sets in some older versions of Maya apparently. Sets are used here for performance reason, so explicitly cast them to list to make Maya happy.

* OP-6360 - added documentation about matchmove family

* OP-6360 - copy input planes

* OP-6360 - expose Settings to keep Image planes

Previous implementation didn't export Image planes in Maya file, to keep behavior backward compatible new Setting was added and set to False.

* OP-6360 - make both camera extractors optional

In Settings Alembic extractor was visible as optional even if code didn't follow that.

* OP-6360 - used long name

* OP-6360 - fix wrong variable

* Update openpype/hosts/maya/plugins/publish/extract_camera_mayaScene.py

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>

* OP-6360 - removed shortening of varible

* OP-6360 - Hound

* OP-6360 - fix wrong key

* Update openpype/hosts/maya/plugins/publish/extract_camera_mayaScene.py

Co-authored-by: Toke Jepsen <tokejepsen@gmail.com>

* Update openpype/hosts/maya/api/lib.py

Co-authored-by: Toke Jepsen <tokejepsen@gmail.com>

* Update openpype/hosts/maya/plugins/publish/extract_camera_alembic.py

Co-authored-by: Toke Jepsen <tokejepsen@gmail.com>

* OP-6360 - fix wrong variable

* OP-6360 - added reattaching method

Image planes were attached wrong, added method to reattach them properly.

* Revert "Update openpype/hosts/maya/api/lib.py"

This reverts commit 4f40ad613946903e8c51b2720ac52756e701f8b8.

* OP-6360 - exported baked camera should be deleted

Forgotten commenting just for development.

* OP-6360 - updated docstring

* OP-6360 - remove scale keys

Currently parentConstraint from old camera to new one doesn't work for keyed scale attributes. To key scale attributes doesn't make much sense so as a workaround, keys for scale attributes are checked AND if they are diferent from defaults (1.0) publish fails (as artist might want to actually key scale). If all scale keys are defaults, they are temporarily removed, cameras are parent constrained, exported and old camera returned to original state.

* OP-6360 - cleaned up resetting of scale keys

Batch calls used instead of one by one.
Cleaned up a return type as key value is no necessary as we are not setting it, just key.

* OP-6360 - removed unnecessary logging

* OP-6360 - reattach image plane to original camera

Image plane must be reattached before baked camera(s) are deleted.

* OP-6360 - added context manager to keep image planes attached to original camera

Without this image planes would disappear after removal of baked cameras.

* OP-6360 - refactored contextmanager

* OP-6360 - renamed flag

Input connections are not copied anymore as they might be dangerous. It is possible to epxlicitly attach only image planes instead.

* OP-6360 - removed copyInputConnections

Copying input connections might be dangerous (rig etc.), it is possible to explicitly attach only image planes.

* OP-6360 - updated plugin labels

* Update openpype/hosts/maya/plugins/create/create_matchmove.py

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>

* OP-6360 - fixed formatting

---------

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
Co-authored-by: Toke Jepsen <tokejepsen@gmail.com>
2023-09-29 17:33:28 +02:00
Kayla
846bd0fd59 make sure there is a check in relative names in namespace before yield function & add docstring 2023-09-29 22:12:02 +08:00
Kayla
37cefd892c abstract namespaced functions for extract fbx animation and add fbx loaders in animatin family 2023-09-29 18:26:58 +08:00
Kayla
c5d54a522a make sure skeleton_Anim set and skeleton_Mesh set inside the loaded rig_sets 2023-09-28 22:51:53 +08:00
Kayla
dda932e83e code clean up and tweak on debug mesg 2023-09-28 22:37:30 +08:00
Kayla
a0d459eb69 Merge branch 'develop' into enhancement/OP-6629_Maya-Export-Rig-Animation-as-FBX 2023-09-24 13:11:37 +08:00
Kayla
b7995a41a7 enable the skeleton rig content validator and make the fbx animation collector optional and use the asset as both asset_name and asset_type data for custom subset in the loader 2023-09-20 21:26:02 +08:00
Ondřej Samohel
e6ce9fd9e1
Merge pull request #5573 from BigRoy/feature/maya_usd_native_support 2023-09-19 17:15:36 +02:00
Toke Stuart Jepsen
9f040265e7 Remove context prompt. 2023-09-18 16:07:54 +01:00
Kayla
7252acceb8 hound 2023-09-18 21:52:17 +08:00
Kayla
5429616e1e add fbx as representation to the loader and hound fix 2023-09-18 21:50:13 +08:00
Kayla
b5d789e09b remove animationOnly parameter as it would convert the joint to transform data 2023-09-18 20:36:00 +08:00
Kayla
c78d496ec9 including skeleton sets into animation sets during loading rig & fixing the rig fbx extractor not being displayed 2023-09-18 12:17:22 +08:00
Roy Nieterau
b56d4633e1
Merge branch 'develop' into enhancement/publish_instances_uuid_from_host 2023-09-13 22:51:31 +02:00
Kayla Man
c07e741b7a hound 2023-09-13 13:35:55 +08:00