TVPaint frame range definition

pype/hosts/tvpaint/lib.py

@@ -48,24 +48,19 @@ def set_context_settings(asset):
  frame_start = asset["data"].get("frameStart")
  frame_end = asset["data"].get("frameEnd")
 
- if frame_start and frame_end:
- handles = asset["data"].get("handles") or 0
- handle_start = asset["data"].get("handleStart")
- if handle_start is None:
- handle_start = handles
+ if frame_start is None or frame_end is None:
+ print("Frame range was not found!")
+ return
 
- handle_end = asset["data"].get("handleEnd")
- if handle_end is None:
- handle_end = handles
+ handles = asset["data"].get("handles") or 0
+ handle_start = asset["data"].get("handleStart")
+ handle_end = asset["data"].get("handleEnd")
+ if handle_start is None or handle_end is None:
+ handle_start = handle_end = handles
 
- frame_start -= int(handle_start)
- frame_end += int(handle_end)
+ # Always start from 0 Mark In and set only Mark Out
+ mark_in = 0
+ mark_out = mark_in + (frame_end - frame_start) + handle_start + handle_end
 
- avalon.tvpaint.lib.execute_george(
- "tv_markin {} set".format(frame_start - 1)
- )
- avalon.tvpaint.lib.execute_george(
- "tv_markout {} set".format(frame_end - 1)
- )
- else:
- print("Frame range was not found!")
+ avalon.tvpaint.lib.execute_george("tv_markin {} set".format(mark_in))
+ avalon.tvpaint.lib.execute_george("tv_markout {} set".format(mark_out))

pype/plugins/tvpaint/publish/collect_instance_frames.py

@@ -0,0 +1,37 @@
+import pyblish.api
+
+
+class CollectOutputFrameRange(pyblish.api.ContextPlugin):
+ """Collect frame start/end from context.
+
+ When instances are collected context does not contain `frameStart` and
+ `frameEnd` keys yet. They are collected in global plugin
+ `CollectAvalonEntities`.
+ """
+ label = "Collect output frame range"
+ order = pyblish.api.CollectorOrder
+ hosts = ["tvpaint"]
+
+ def process(self, context):
+ for instance in context:
+ frame_start = instance.data.get("frameStart")
+ frame_end = instance.data.get("frameEnd")
+ if frame_start is not None and frame_end is not None:
+ self.log.debug(
+ "Instance {} already has set frames {}-{}".format(
+ str(instance), frame_start, frame_end
+ )
+ )
+ return
+
+ frame_start = context.data.get("frameStart")
+ frame_end = context.data.get("frameEnd")
+
+ instance.data["frameStart"] = frame_start
+ instance.data["frameEnd"] = frame_end
+
+ self.log.info(
+ "Set frames {}-{} on instance {} ".format(
+ frame_start, frame_end, str(instance)
+ )
+ )

pype/plugins/tvpaint/publish/collect_instances.py

@@ -86,9 +86,6 @@ def process(self, context):
 
  instance.data["publish"] = any_visible
 
- instance.data["frameStart"] = context.data["sceneMarkIn"] + 1
- instance.data["frameEnd"] = context.data["sceneMarkOut"] + 1
-
  self.log.debug("Created instance: {}\n{}".format(
  instance, json.dumps(instance.data, indent=4)
  ))