Merge pull request #1614 from 2-REC-forks/bc/2.x/fix/capture

pype/hosts/maya/lib.py

@@ -2126,15 +2126,13 @@ def _get_attrs(node):
  return world_space_nodes
 
 
-def load_capture_preset(path=None, data=None):
- import capture_gui
+def load_capture_preset(data=None):
  import capture
 
  if data:
  preset = data
  else:
- path = path
- preset = capture_gui.lib.load_json(path)
+ return {}
  print(preset)
 
  options = dict()
@@ -2147,11 +2145,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'
@@ -2161,9 +2155,9 @@ def load_capture_preset(path=None, data=None):
  # DISPLAY OPTIONS
  id = 'Display Options'
  disp_options = {}
- for key in preset['Display Options']:
+ for key in preset[id]:
  if key.startswith('background'):
- disp_options[key] = preset['Display Options'][key]
+ disp_options[key] = preset[id][key]
  else:
  disp_options['displayGradient'] = True
 
@@ -2231,16 +2225,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
 

pype/plugins/maya/publish/extract_playblast.py

@@ -43,13 +43,16 @@ def process(self, instance):
 
  # get cameras
  camera = instance.data['review_camera']
- capture_preset = instance.context.data['presets']['maya']['capture']
+ capture_preset = instance.context.data.get(
+ 'presets', {}).get('maya', {}).get('capture')
 
  try:
  preset = lib.load_capture_preset(data=capture_preset)
- except Exception:
+ except Exception as exc:
+ self.log.error(
+ 'Error loading capture presets: {}'.format(str(exc)))
  preset = {}
- self.log.info('using viewport preset: {}'.format(preset))
+ self.log.info('Using viewport preset: {}'.format(preset))
 
  preset['camera'] = camera
  preset['format'] = "image"
@@ -78,7 +81,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.
@@ -96,9 +99,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)
 
  collected_files = os.listdir(stagingdir)

pype/plugins/maya/publish/extract_thumbnail.py

@@ -12,10 +12,10 @@
 
 
 class ExtractThumbnail(pype.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.
 
  """
 
@@ -28,13 +28,16 @@ def process(self, instance):
 
  camera = instance.data['review_camera']
 
- capture_preset = ""
- capture_preset = instance.context.data['presets']['maya']['capture']
+ capture_preset = instance.context.data.get(
+ 'presets', {}).get('maya', {}).get('capture')
+
  try:
  preset = lib.load_capture_preset(data=capture_preset)
- except:
+ except Exception as exc:
+ self.log.error(
+ 'Error loading capture presets: {}'.format(str(exc)))
  preset = {}
- self.log.info('using viewport preset: {}'.format(capture_preset))
+ self.log.info('Using viewport preset: {}'.format(preset))
 
  # preset["off_screen"] = False
 
@@ -75,7 +78,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():
@@ -86,9 +89,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)