Commit graph

1260 commits

Author SHA1 Message Date
Roy Nieterau
551146ebe9 Merge remote-tracking branch 'upstream/develop' into substance_integration 2023-04-24 14:44:29 +02:00
Jakub Jezek
f05f7510b4
adding slate condition to plugin 2023-04-20 21:39:49 +02:00
Roy Nieterau
3c56b89606
Merge branch 'develop' into substance_integration 2023-04-19 10:18:37 +02:00
Roy Nieterau
b05afaa837
Global: Optimize anatomy formatting by only formatting used templates instead (#4784)
* TemplatesDict can create different type of template

* anatomy templates can be formatted on their own

* return objected templates on get item

* '_rootless_path' is public classmethod 'rootless_path_from_result'

* 'AnatomyStringTemplate' expect anatomy templates

* remove key getters

* fix typo 'create_ojected_templates' -> 'create_objected_templates'

* Fix type of argument

* Fix long line

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Use format strict + code cosmetics

* Get template from the formatted data

* Update openpype/plugins/publish/integrate_legacy.py

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

* Cosmetics

* Move template obj definition for path up + rename to `path_template_obj`

* Refactor more cases from `anatomy.format` to template obj `.format_strict`

* Refactor more cases from `anatomy.format` to template obj `.format_strict`

* Refactor more cases from `anatomy.format` to template obj `.format_strict`

---------

Co-authored-by: Jakub Trllo <jakub.trllo@gmail.com>
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-04-17 14:53:15 +02:00
Ondřej Samohel
84cc7e12cc
Merge branch 'develop' into bugfix/OP-3951_Deadline-checking-existing-frames-fails-when-there-is-number-in-file-name 2023-04-13 12:35:26 +02:00
Ondřej Samohel
f8386fe66a
Merge branch 'develop' into substance_integration 2023-04-13 12:01:20 +02:00
Ondřej Samohel
25bb76226b
Merge branch 'develop' into instance_collect_no_asset_framerange 2023-04-13 11:58:33 +02:00
Ondřej Samohel
707eedf98d
Merge branch 'develop' into houdini_opengl 2023-04-12 14:28:49 +02:00
Jakub Trllo
d8987149ad
General: Extract burnin hosts filters (#4749)
* remove hosts filter in ExtractBurnin

* skip instances without representations instead of crash

---------

Co-authored-by: Jakub Ježek <jakubjezek001@gmail.com>
2023-04-12 10:34:11 +02:00
Roy Nieterau
5cca466c04
Merge branch 'develop' into houdini_opengl 2023-04-05 12:34:53 +02:00
Jakub Jezek
1944643d78
make label key optional on instance.data 2023-04-05 11:39:28 +02:00
Roy Nieterau
4633f97cd2
Merge branch 'develop' into substance_integration 2023-04-04 16:27:45 +02:00
Roy Nieterau
af7e4d035f
Merge branch 'develop' into houdini_opengl 2023-04-04 12:05:12 +02:00
Roy Nieterau
eb0f15002b
Merge branch 'develop' into houdini_opengl 2023-04-04 02:06:20 +02:00
Roy Nieterau
439967c8c2 Merge remote-tracking branch 'upstream/develop' into substance_integration 2023-04-04 00:15:30 +02:00
Roy Nieterau
93f7eedfe5
Merge branch 'develop' into instance_collect_no_asset_framerange 2023-04-03 18:20:15 +02:00
Roy Nieterau
0b590ea31d Merge remote-tracking branch 'upstream/develop' into refactor/remove_handles
# Conflicts:
#	openpype/hosts/maya/plugins/publish/collect_review.py
2023-04-03 18:07:15 +02:00
Milan Kolar
852f6fedd0
Merge pull request #4740 from BigRoy/extract_burnin_fix_env_pythonhome 2023-04-03 17:59:12 +02:00
Roy Nieterau
4bdf5b79b8
Improve speed of Collect Custom Staging Directory 2023-04-03 17:44:21 +02:00
Roy Nieterau
053021eb64 Merge remote-tracking branch 'upstream/develop' into substance_integration 2023-04-03 11:33:00 +02:00
Jakub Ježek
ca92f15042
Merge branch 'develop' into extract_burnin_fix_env_pythonhome 2023-03-31 22:33:37 +02:00
Jakub Ježek
21db6ee9fc
Merge branch 'develop' into instance_collect_no_asset_framerange 2023-03-31 22:03:21 +02:00
Jakub Ježek
a0b31195b5
Merge branch 'develop' into houdini_opengl 2023-03-31 22:00:26 +02:00
Jakub Ježek
c0d4ab010a
Merge branch 'develop' into refactor/remove_handles 2023-03-31 21:58:53 +02:00
Toke Stuart Jepsen
7fb5242fca Merge branch 'develop' into feature/OP-3926_gpu-cache
# Conflicts:
#	openpype/settings/defaults/project_settings/maya.json
#	openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
2023-03-31 16:20:08 +01:00
Roy Nieterau
74f73969ad
Remove "preview" data from representation (#4759)
* Remove "preview" data from representation

* pop "preview" from component in standalone publisher

---------

Co-authored-by: Jakub Trllo <jakub.trllo@gmail.com>
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-03-31 17:08:58 +02:00
Roy Nieterau
0a5e82f132 Merge remote-tracking branch 'upstream/develop' into houdini_opengl 2023-03-31 16:18:23 +02:00
Jakub Ježek
d933917a53
Merge branch 'develop' into refactor/cleanup_grammar 2023-03-31 14:28:22 +02:00
Roy Nieterau
5b163fe84d
Apply suggestions from code review
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-03-30 22:40:44 +02:00
Jakub Trllo
ac4ed94a97
Merge branch 'develop' into extract_burnin_fix_env_pythonhome 2023-03-30 19:59:38 +02:00
Jakub Trllo
d2e48426a6
add all sites of previous files to new files (#4737)
Co-authored-by: Jakub Ježek <jakubjezek001@gmail.com>
2023-03-30 19:04:44 +02:00
Roy Nieterau
3fae1f8521 Just some grammar tweaks 2023-03-30 13:59:22 +02:00
Petr Kalis
028d46597e Merge remote-tracking branch 'origin/bugfix/OP-3951_Deadline-checking-existing-frames-fails-when-there-is-number-in-file-name' into bugfix/OP-3951_Deadline-checking-existing-frames-fails-when-there-is-number-in-file-name 2023-03-30 13:43:11 +02:00
Petr Kalis
97d5b187e8 OP-3951 - updated logic
Doesn't make sense to validate sequence for single frame.
Updated tests accordingly. No sense in testing single frames so widely.
2023-03-30 13:42:30 +02:00
Roy Nieterau
d958f989e0 Remove "handles" backwards compatibility 2023-03-29 23:57:35 +02:00
Roy Nieterau
391b7450dd Don't pass empty env since it didn't do that prior to this either 2023-03-29 17:58:22 +02:00
Roy Nieterau
669a2256ef Merge develop 2023-03-29 14:46:41 +02:00
Roy Nieterau
6405700ed9 Merge develop 2023-03-29 14:36:31 +02:00
Petr Kalis
c5172b7410
OP-3951 - update imports
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-03-29 13:17:24 +02:00
Toke Stuart Jepsen
cfb9293348 Merge branch 'develop' into feature/OP-3926_gpu-cache
# Conflicts:
#	website/docs/admin_hosts_maya.md
2023-03-29 10:26:50 +01:00
Toke Jepsen
b7f6589886
Merge branch 'develop' into feature/OP-3278_camera-focal-length 2023-03-29 11:12:09 +02:00
Petr Kalis
93d98c3f9c OP-3951 - use ext on representation
Without it ass.gz files won't work
2023-03-27 16:55:19 +02:00
Petr Kalis
1531708236
Global: persistent staging directory for renders (#4583)
* OP-4258 - Settings for transient template

* OP-4258 - added collector for transient staging dir

Allows setting profiles to create persistent stagingDir.

* OP-4258 - implemented persistent stagingDir in cleanup

* OP-4258 - updated logging

* OP-4258 - updated settings

* OP-4258 - Hound

* OP-4258 - renamed class to better name

* OP-4258 - changed location of Settings

Should be used in create and collecting phase also.

* OP-4258 - remove version placeholder from transient template

It was discussed that it shouldn't be used for now.

* OP-4258 - extracted transient dir query logic

This should be used in collection and creation phase for DCCs which are storing staging dir path directly into nodes.

* OP-4258 - added use of scene_name placeholder in collector

DCC dependent, way how to implement versioning, might not be used.

* OP-4258 - fix scene_name

* OP-4258 - remove wrong defaults

* OP-4258 - added possibility of different template name

Studio might want to put renders to different place from caches.

* OP-4258 - renamed according to GH comments

* OP-4258 - use is active filter

* OP-4258 - use is active filter

* OP-4793 - added project_settings to signature

* OP-4793 - updated logging message

* OP-4793 - added documentation

* OP-4258 - fix function arguments

* OP-4258 - updates to documentation


* OP-4258 - added known issues to documentation

---------

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2023-03-24 16:30:46 +01:00
Petr Kalis
30916962c8
OP-3951 - refactor
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-03-24 12:34:23 +01:00
Petr Kalis
87fe237aa7 OP-3951 - fix - do not change files in place
Integrator depends that single files is not in list.
2023-03-24 11:14:51 +01:00
Jakub Trllo
08e74afa36
Merge branch 'develop' into instance_collect_no_asset_framerange 2023-03-24 11:01:32 +01:00
Petr Kalis
e8f9c130bb OP-3951 - merged global validator and unreal one
Both should do same thing. Combination of host and family should be safe.
2023-03-23 18:11:28 +01:00
Petr Kalis
3860fe3692 OP-3951 - updated validator to use special pattern
Handles numbers (version, instance number) in file names.
2023-03-23 18:09:11 +01:00
Roy Nieterau
13aa1c82fa Merge remote-tracking branch 'upstream/develop' into substance_integration 2023-03-23 13:41:07 +01:00
Roy Nieterau
5b3af11f0f Fix the if statement 2023-03-23 11:04:25 +01:00