Merge pull request #3460 from BigRoy/cleanup_reuse_maintained_time

openpype/hosts/maya/plugins/publish/extract_playblast.py

@@ -115,7 +115,7 @@ def process(self, instance):
  else:
  preset["viewport_options"] = {"imagePlane": image_plane}
 
- with maintained_time():
+ with lib.maintained_time():
  filename = preset.get("filename", "%TEMP%")
 
  # Force viewer to False in call to capture because we have our own
@@ -178,12 +178,3 @@ def process(self, instance):
  'camera_name': camera_node_name
  }
  instance.data["representations"].append(representation)
-
-
-@contextlib.contextmanager
-def maintained_time():
- ct = cmds.currentTime(query=True)
- try:
- yield
- finally:
- cmds.currentTime(ct, edit=True)

openpype/hosts/maya/plugins/publish/extract_thumbnail.py

@@ -1,5 +1,4 @@
 import os
-import contextlib
 import glob
 
 import capture
@@ -28,7 +27,6 @@ def process(self, instance):
 
  camera = instance.data['review_camera']
 
- capture_preset = ""
  capture_preset = (
  instance.context.data["project_settings"]['maya']['publish']['ExtractPlayblast']['capture_preset']
  )
@@ -103,9 +101,7 @@ def process(self, instance):
  if preset.pop("isolate_view", False) and instance.data.get("isolate"):
  preset["isolate"] = instance.data["setMembers"]
 
- with maintained_time():
- filename = preset.get("filename", "%TEMP%")
-
+ with lib.maintained_time():
  # 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
@@ -174,12 +170,3 @@ def _fix_playblast_output_path(self, filepath):
  filepath = max(files, key=os.path.getmtime)
 
  return filepath
-
-
-@contextlib.contextmanager
-def maintained_time():
- ct = cmds.currentTime(query=True)
- try:
- yield
- finally:
- cmds.currentTime(ct, edit=True)