From c8d2500c8f3dfd390d2ccfa6c164c3232a8d096c Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 5 Nov 2021 17:44:02 +0100 Subject: [PATCH] few smaller fixes --- openpype/hosts/tvpaint/lib.py | 6 +++--- openpype/hosts/tvpaint/plugins/publish/extract_sequence.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/tvpaint/lib.py b/openpype/hosts/tvpaint/lib.py index 7624658bca..c34afb00c4 100644 --- a/openpype/hosts/tvpaint/lib.py +++ b/openpype/hosts/tvpaint/lib.py @@ -6,7 +6,7 @@ from PIL import Image, ImageDraw def backwards_id_conversion(data_by_layer_id): """Convert layer ids to strings from integers.""" for key in tuple(data_by_layer_id.keys()): - if not isinstance(str): + if not isinstance(key, str): data_by_layer_id[str(key)] = data_by_layer_id.pop(key) @@ -247,7 +247,7 @@ def _cleanup_frame_references(output_idx_by_frame_idx): """ for frame_idx in tuple(output_idx_by_frame_idx.keys()): reference_idx = output_idx_by_frame_idx[frame_idx] - if reference_idx == frame_idx: + if reference_idx is None or reference_idx == frame_idx: continue real_reference_idx = reference_idx @@ -457,7 +457,7 @@ def fill_reference_frames(frame_references, filepaths_by_frame): # Get destination filepath src_filepath = filepaths_by_frame[ref_idx] - dst_filepath = filepaths_by_frame[ref_idx] + dst_filepath = filepaths_by_frame[frame_idx] if hasattr(os, "link"): os.link(src_filepath, dst_filepath) diff --git a/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py b/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py index ff0c65475b..916d8ee73b 100644 --- a/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py +++ b/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py @@ -350,7 +350,7 @@ class ExtractSequence(pyblish.api.Extractor): filepaths_by_layer_id = {} for layer_id, render_data in extraction_data_by_layer_id.items(): layer = layers_by_id[layer_id] - filepaths_by_layer_id = self._render_layer( + filepaths_by_layer_id[layer_id] = self._render_layer( render_data, layer, output_dir ) @@ -431,7 +431,7 @@ class ExtractSequence(pyblish.api.Extractor): if frame_idx != ref_idx: continue - frames_to_render.append(frame_idx) + frames_to_render.append(str(frame_idx)) # Go to frame george_script_lines.append("tv_layerImage {}".format(frame_idx)) # Store image to output