Merge pull request #1617 from 2-REC-forks/bc/fix/capture

openpype/hosts/maya/api/lib.py

@@ -2124,7 +2124,7 @@ def _get_attrs(node):
  return world_space_nodes
 
 
-def load_capture_preset(path=None, data=None):
+def load_capture_preset(data=None):
  import capture
 
  preset = data
@@ -2139,11 +2139,7 @@ def load_capture_preset(path=None, data=None):
  # GENERIC
  id = 'Generic'
  for key in preset[id]:
- if key.startswith('isolate'):
- pass
- # options['isolate'] = preset[id][key]
- else:
- options[str(key)] = preset[id][key]
+ options[str(key)] = preset[id][key]
 
  # RESOLUTION
  id = 'Resolution'
@@ -2224,16 +2220,6 @@ def load_capture_preset(path=None, data=None):
  # use active sound track
  scene = capture.parse_active_scene()
  options['sound'] = scene['sound']
- cam_options = dict()
- cam_options['overscan'] = 1.0
- cam_options['displayFieldChart'] = False
- cam_options['displayFilmGate'] = False
- cam_options['displayFilmOrigin'] = False
- cam_options['displayFilmPivot'] = False
- cam_options['displayGateMask'] = False
- cam_options['displayResolution'] = False
- cam_options['displaySafeAction'] = False
- cam_options['displaySafeTitle'] = False
 
  # options['display_options'] = temp_options
 

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

@@ -72,7 +72,7 @@ def process(self, instance):
 
  # Isolate view is requested by having objects in the set besides a
  # camera.
- if instance.data.get("isolate"):
+ if preset.pop("isolate_view", False) or instance.data.get("isolate"):
  preset["isolate"] = instance.data["setMembers"]
 
  # Show/Hide image planes on request.
@@ -90,9 +90,6 @@ def process(self, instance):
  # playblast and viewer
  preset['viewer'] = False
 
- # Remove panel key since it's internal value to capture_gui
- preset.pop("panel", None)
-
  self.log.info('using viewport preset: {}'.format(preset))
 
  path = capture.capture(**preset)

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

@@ -12,10 +12,10 @@
 
 
 class ExtractThumbnail(openpype.api.Extractor):
- """Extract a Camera as Alembic.
+ """Extract viewport thumbnail.
 
- The cameras gets baked to world space by default. Only when the instance's
- `bakeToWorldSpace` is set to False it will include its full hierarchy.
+ Takes review camera and creates a thumbnail based on viewport
+ capture.
 
  """
 
@@ -35,9 +35,10 @@ def process(self, instance):
 
  try:
  preset = lib.load_capture_preset(data=capture_preset)
- except:
+ except KeyError as ke:
+ self.log.error('Error loading capture presets: {}'.format(str(ke)))
  preset = {}
- self.log.info('using viewport preset: {}'.format(capture_preset))
+ self.log.info('Using viewport preset: {}'.format(preset))
 
  # preset["off_screen"] = False
 
@@ -74,7 +75,7 @@ def process(self, instance):
 
  # Isolate view is requested by having objects in the set besides a
  # camera.
- if instance.data.get("isolate"):
+ if preset.pop("isolate_view", False) or instance.data.get("isolate"):
  preset["isolate"] = instance.data["setMembers"]
 
  with maintained_time():
@@ -85,9 +86,6 @@ def process(self, instance):
  # playblast and viewer
  preset['viewer'] = False
 
- # Remove panel key since it's internal value to capture_gui
- preset.pop("panel", None)
-
  path = capture.capture(**preset)
  playblast = self._fix_playblast_output_path(path)