Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4702 from tokejepsen/bugfix/OP-2834_Fix-extract-playblast

Browse source 
Refactor _capture
This commit is contained in:
Toke Jepsen 2023-03-24 10:45:18 +01:00 • committed by GitHub
commit 8cb69cef30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
openpype/hosts/maya/plugins/publish/extract_playblast.py
View file

@ -37,29 +37,13 @@ class ExtractPlayblast(publish.Extractor):
capture_preset = {}
def _capture(self, preset, override_viewport_options, instance):
filename = preset.get("filename", "%TEMP%")
# Force viewer to False in call to capture because we have our own
# viewer opening call to allow a signal to trigger between
# playblast and viewer
preset['viewer'] = False
# Update preset with current panel setting
# if override_viewport_options is turned off
if not override_viewport_options:
panel_preset = capture.parse_view(instance.data["panel"])
panel_preset.pop("camera")
preset.update(panel_preset)
self.log.info(
"Using preset:\n{}".format(
json.dumps(preset, sort_keys=True, indent=4)
)
)
path = capture.capture(log=self.log, **preset)
return filename, path
return capture.capture(log=self.log, **preset)
def process(self, instance):
self.log.info("Extracting capture..")
@ -175,6 +159,18 @@ class ExtractPlayblast(publish.Extractor):
capture_presets['Viewport Options']['override_viewport_options']
)
# Force viewer to False in call to capture because we have our own
# viewer opening call to allow a signal to trigger between
# playblast and viewer
preset['viewer'] = False
# Update preset with current panel setting
# if override_viewport_options is turned off
if not override_viewport_options:
panel_preset = capture.parse_view(instance.data["panel"])
panel_preset.pop("camera")
preset.update(panel_preset)
# Need to ensure Python 2 compatibility.
# TODO: Remove once dropping Python 2.
if getattr(contextlib, "nested", None):
@ -183,7 +179,7 @@ class ExtractPlayblast(publish.Extractor):
lib.maintained_time(),
panel_camera(instance.data["panel"], preset["camera"])
):
filename, path = self._capture(
path = self._capture(
preset, override_viewport_options, instance
)
else:
@ -194,7 +190,7 @@ class ExtractPlayblast(publish.Extractor):
panel_camera(instance.data["panel"], preset["camera"])
)
filename, path = self._capture(
path = self._capture(
preset, override_viewport_options, instance
)
@ -214,6 +210,7 @@ class ExtractPlayblast(publish.Extractor):
minimum_items=1,
patterns=patterns)
filename = preset.get("filename", "%TEMP%")
self.log.debug("filename {}".format(filename))
frame_collection = None
for collection in collections: