Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hound

Browse source
This commit is contained in:
Petr Kalis 2020-12-02 21:34:15 +01:00
parent e92c842c8a
commit 19be398587
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pype/plugins/aftereffects/load/load_background.py
View file

@ -24,7 +24,8 @@ class BackgroundLoader(api.Loader):
items = stub.get_items(comps=True)
existing_items = [layer.name for layer in items]
comp_name = get_unique_layer_name(existing_items,
comp_name = get_unique_layer_name(
existing_items,
"{}_{}".format(context["asset"]["name"], name))
layers = get_background_layers(self.fname)
@ -60,7 +61,8 @@ class BackgroundLoader(api.Loader):
if namespace_from_container != comp_name:
items = stub.get_items(comps=True)
existing_items = [layer.name for layer in items]
comp_name = get_unique_layer_name(existing_items,
comp_name = get_unique_layer_name(
existing_items,
"{}_{}".format(context["asset"], context["subset"]))
else: # switching version - keep same name
comp_name = container["namespace"]
@ -93,4 +95,4 @@ class BackgroundLoader(api.Loader):
stub.delete_item(layer.id)
def switch(self, container, representation):
self.update(container, representation)
self.update(container, representation)

10
pype/plugins/aftereffects/load/load_file.py
View file

@ -23,8 +23,8 @@ class FileLoader(api.Loader):
def load(self, context, name=None, namespace=None, data=None):
layers = stub.get_items(comps=True, folders=True, footages=True)
existing_layers = [layer.name for layer in layers]
comp_name = lib.get_unique_layer_name(existing_layers,
"{}_{}".format(context["asset"]["name"], name))
comp_name = lib.get_unique_layer_name(
existing_layers, "{}_{}".format(context["asset"]["name"], name))
import_options = {}
@ -80,9 +80,9 @@ class FileLoader(api.Loader):
if namespace_from_container != layer_name:
layers = stub.get_items(comps=True)
existing_layers = [layer.name for layer in layers]
layer_name = lib.get_unique_layer_name(existing_layers,
"{}_{}".format(context["asset"],
context["subset"]))
layer_name = lib.get_unique_layer_name(
existing_layers,
"{}_{}".format(context["asset"], context["subset"]))
else: # switching version - keep same name
layer_name = container["namespace"]
path = api.get_representation_path(representation)