diff --git a/pype/modules/websocket_server/stubs/aftereffects_server_stub.py b/pype/modules/websocket_server/stubs/aftereffects_server_stub.py index 2168a9ee55..697809363e 100644 --- a/pype/modules/websocket_server/stubs/aftereffects_server_stub.py +++ b/pype/modules/websocket_server/stubs/aftereffects_server_stub.py @@ -90,7 +90,7 @@ class AfterEffectsServerStub(): layers_meta[str(layer.id)] = data # Ensure only valid ids are stored. if not all_layers: - # loaders create FootagetItem now + # loaders create FootageItem now all_layers = self.get_items(comps=True, folders=False, footages=True) @@ -112,7 +112,7 @@ class AfterEffectsServerStub(): Returns(string): file name """ res = self.websocketserver.call(self.client.call( - 'AfterEffects.get_active_document_full_name')) + 'AfterEffects.get_active_document_full_name')) return res @@ -122,14 +122,14 @@ class AfterEffectsServerStub(): Returns(string): file name """ res = self.websocketserver.call(self.client.call( - 'AfterEffects.get_active_document_name')) + 'AfterEffects.get_active_document_name')) return res - def get_items(self, comps, folders=False, footages=False): + def get_items(self, comps, folders=False, footages=False): """ Get all items from Project panel according to arguments. - There are mutliple different types: + There are multiple different types: CompItem (could have multiple layers - source for Creator) FolderItem (collection type, currently not used FootageItem (imported file - created by Loader) diff --git a/pype/plugins/aftereffects/load/load_resource.py b/pype/plugins/aftereffects/load/load_resource.py index 73b0a4aae3..96c6c9c3da 100644 --- a/pype/plugins/aftereffects/load/load_resource.py +++ b/pype/plugins/aftereffects/load/load_resource.py @@ -49,7 +49,6 @@ class ResourceLoader(api.Loader): if '.psd' in file: import_options['ImportAsType'] = 'ImportAsType.COMP' - #with photoshop.maintained_selection(): comp = stub.import_file(self.fname, comp_name, import_options) self[:] = [comp] @@ -98,5 +97,3 @@ class ResourceLoader(api.Loader): def switch(self, container, representation): self.update(container, representation) - - diff --git a/pype/plugins/lib.py b/pype/plugins/lib.py index 71a4d1e7d5..d7d90af165 100644 --- a/pype/plugins/lib.py +++ b/pype/plugins/lib.py @@ -1,5 +1,6 @@ import re + def get_unique_layer_name(layers, asset_name, subset_name): """ Gets all layer names and if 'name' is present in them, increases