From 657d107e3b850dc1f98cca10a9c2383f0b2ce4e0 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 23 Sep 2021 16:05:20 +0100 Subject: [PATCH 001/123] Implemented JSON layout loading for Unreal --- .../blender/plugins/publish/extract_fbx.py | 9 +- .../blender/plugins/publish/extract_layout.py | 9 + .../hosts/unreal/plugins/load/load_layout.py | 328 ++++++++++++++++++ .../hosts/unreal/plugins/load/load_rig.py | 4 +- .../unreal/plugins/load/load_staticmeshfbx.py | 4 +- 5 files changed, 350 insertions(+), 4 deletions(-) create mode 100644 openpype/hosts/unreal/plugins/load/load_layout.py diff --git a/openpype/hosts/blender/plugins/publish/extract_fbx.py b/openpype/hosts/blender/plugins/publish/extract_fbx.py index b91f2a75ef..0d2b5c1000 100644 --- a/openpype/hosts/blender/plugins/publish/extract_fbx.py +++ b/openpype/hosts/blender/plugins/publish/extract_fbx.py @@ -1,11 +1,11 @@ import os +import bpy + from openpype import api from openpype.hosts.blender.api import plugin from avalon.blender.pipeline import AVALON_PROPERTY -import bpy - class ExtractFBX(api.Extractor): """Extract as FBX.""" @@ -50,6 +50,9 @@ class ExtractFBX(api.Extractor): new_materials.append(mat) new_materials_objs.append(obj) + scale_length = bpy.context.scene.unit_settings.scale_length + bpy.context.scene.unit_settings.scale_length = 0.01 + # We export the fbx bpy.ops.export_scene.fbx( context, @@ -60,6 +63,8 @@ class ExtractFBX(api.Extractor): add_leaf_bones=False ) + bpy.context.scene.unit_settings.scale_length = scale_length + bpy.ops.object.select_all(action='DESELECT') for mat in new_materials: diff --git a/openpype/hosts/blender/plugins/publish/extract_layout.py b/openpype/hosts/blender/plugins/publish/extract_layout.py index cd081b4479..f54215800f 100644 --- a/openpype/hosts/blender/plugins/publish/extract_layout.py +++ b/openpype/hosts/blender/plugins/publish/extract_layout.py @@ -42,9 +42,18 @@ class ExtractLayout(openpype.api.Extractor): }, projection={"_id": True}) blend_id = blend["_id"] + fbx = io.find_one( + { + "type": "representation", + "parent": io.ObjectId(parent), + "name": "fbx" + }, + projection={"_id": True}) + fbx_id = fbx["_id"] json_element = {} json_element["reference"] = str(blend_id) + json_element["reference_fbx"] = str(fbx_id) json_element["family"] = family json_element["instance_name"] = asset.name json_element["asset_name"] = metadata["asset_name"] diff --git a/openpype/hosts/unreal/plugins/load/load_layout.py b/openpype/hosts/unreal/plugins/load/load_layout.py new file mode 100644 index 0000000000..0419fb3759 --- /dev/null +++ b/openpype/hosts/unreal/plugins/load/load_layout.py @@ -0,0 +1,328 @@ +import os +import json + +import unreal +from unreal import EditorAssetLibrary +from unreal import EditorLevelLibrary +from unreal import MathLibrary as umath + +from avalon import api, pipeline +from avalon.unreal import lib +from avalon.unreal import pipeline as unreal_pipeline + + +class LayoutLoader(api.Loader): + """Load Layout from a JSON file""" + + families = ["layout"] + representations = ["json"] + + label = "Load Layout" + icon = "code-fork" + color = "orange" + + def _get_asset_containers(self, path): + ar = unreal.AssetRegistryHelpers.get_asset_registry() + + asset_content = EditorAssetLibrary.list_assets( + path, recursive=True) + + asset_containers = [] + + # Get all the asset containers + for a in asset_content: + obj = ar.get_asset_by_object_path(a) + if obj.get_asset().get_class().get_name() == 'AssetContainer': + asset_containers.append(obj) + + return asset_containers + + def _get_loader(self, loaders, family): + name = "" + if family == 'rig': + name = "SkeletalMeshFBXLoader" + elif family == 'model': + name = "StaticMeshFBXLoader" + elif family == 'camera': + name = "CameraLoader" + + if name == "": + return None + + for loader in loaders: + if loader.__name__ == name: + return loader + + return None + + def _process_family(self, assets, classname, transform): + ar = unreal.AssetRegistryHelpers.get_asset_registry() + + for asset in assets: + obj = ar.get_asset_by_object_path(asset).get_asset() + if obj.get_class().get_name() == classname: + actor = EditorLevelLibrary.spawn_actor_from_object( + obj, + transform.get('translation') + ) + actor.set_actor_rotation(unreal.Rotator( + umath.radians_to_degrees( + transform.get('rotation').get('x')), + -umath.radians_to_degrees( + transform.get('rotation').get('y')), + umath.radians_to_degrees( + transform.get('rotation').get('z')), + ), False) + actor.set_actor_scale3d(transform.get('scale')) + + def _process(self, libpath, asset_dir, loaded = []): + with open(libpath, "r") as fp: + data = json.load(fp) + + all_loaders = api.discover(api.Loader) + + # loaded = [] + + for element in data: + reference = element.get('reference_fbx') + + if reference in loaded: + continue + + loaded.append(reference) + + family = element.get('family') + loaders = api.loaders_from_representation( + all_loaders, reference) + loader = self._get_loader(loaders, family) + + if not loader: + continue + + instance_name = element.get('instance_name') + + options = { + "asset_dir": asset_dir + } + + assets = api.load( + loader, + reference, + namespace=instance_name, + options=options + ) + + instances = [ + item for item in data + if item.get('reference_fbx') == reference] + + for instance in instances: + transform = instance.get('transform') + + if family == 'model': + self._process_family(assets, 'StaticMesh', transform) + elif family == 'rig': + self._process_family(assets, 'SkeletalMesh', transform) + + def _remove_family(self, assets, components, classname, propname): + ar = unreal.AssetRegistryHelpers.get_asset_registry() + + objects = [] + for a in assets: + obj = ar.get_asset_by_object_path(a) + if obj.get_asset().get_class().get_name() == classname: + objects.append(obj) + for obj in objects: + for comp in components: + if comp.get_editor_property(propname) == obj.get_asset(): + comp.get_owner().destroy_actor() + + def _remove_actors(self, path): + asset_containers = self._get_asset_containers(path) + + # Get all the static and skeletal meshes components in the level + components = EditorLevelLibrary.get_all_level_actors_components() + static_meshes_comp = [ + c for c in components + if c.get_class().get_name() == 'StaticMeshComponent'] + skel_meshes_comp = [ + c for c in components + if c.get_class().get_name() == 'SkeletalMeshComponent'] + + # For all the asset containers, get the static and skeletal meshes. + # Then, check the components in the level and destroy the matching + # actors. + for asset_container in asset_containers: + package_path = asset_container.get_editor_property('package_path') + family = EditorAssetLibrary.get_metadata_tag( + asset_container.get_asset(), 'family') + assets = EditorAssetLibrary.list_assets( + str(package_path), recursive=False) + if family == 'model': + self._remove_family( + assets, static_meshes_comp, 'StaticMesh', 'static_mesh') + elif family == 'rig': + self._remove_family( + assets, skel_meshes_comp, 'SkeletalMesh', 'skeletal_mesh') + + def load(self, context, name, namespace, options): + """ + Load and containerise representation into Content Browser. + + This is two step process. First, import FBX to temporary path and + then call `containerise()` on it - this moves all content to new + directory and then it will create AssetContainer there and imprint it + with metadata. This will mark this path as container. + + Args: + context (dict): application context + name (str): subset name + namespace (str): in Unreal this is basically path to container. + This is not passed here, so namespace is set + by `containerise()` because only then we know + real path. + data (dict): Those would be data to be imprinted. This is not used + now, data are imprinted by `containerise()`. + + Returns: + list(str): list of container content + """ + # Create directory for asset and avalon container + root = "/Game/Avalon/Assets" + asset = context.get('asset').get('name') + suffix = "_CON" + if asset: + asset_name = "{}_{}".format(asset, name) + else: + asset_name = "{}".format(name) + + tools = unreal.AssetToolsHelpers().get_asset_tools() + asset_dir, container_name = tools.create_unique_asset_name( + "{}/{}/{}".format(root, asset, name), suffix="") + + container_name += suffix + + EditorAssetLibrary.make_directory(asset_dir) + + self._process(self.fname, asset_dir) + + # Create Asset Container + lib.create_avalon_container( + container=container_name, path=asset_dir) + + data = { + "schema": "openpype:container-2.0", + "id": pipeline.AVALON_CONTAINER_ID, + "asset": asset, + "namespace": asset_dir, + "container_name": container_name, + "asset_name": asset_name, + "loader": str(self.__class__.__name__), + "representation": context["representation"]["_id"], + "parent": context["representation"]["parent"], + "family": context["representation"]["context"]["family"] + } + unreal_pipeline.imprint( + "{}/{}".format(asset_dir, container_name), data) + + asset_content = EditorAssetLibrary.list_assets( + asset_dir, recursive=True, include_folder=False) + + for a in asset_content: + EditorAssetLibrary.save_asset(a) + + return asset_content + + def update(self, container, representation): + source_path = api.get_representation_path(representation) + destination_path = container["namespace"] + + self._remove_actors(destination_path) + + with open(source_path, "r") as fp: + data = json.load(fp) + + references = [e.get('reference_fbx') for e in data] + asset_containers = self._get_asset_containers(destination_path) + loaded = [] + + # Delete all the assets imported with the previous version of the + # layout, if they're not in the new layout. + for asset_container in asset_containers: + if asset_container.get_editor_property( + 'asset_name') == container["objectName"]: + continue + ref = EditorAssetLibrary.get_metadata_tag( + asset_container.get_asset(), 'representation') + ppath = asset_container.get_editor_property('package_path') + + if ref not in references: + # If the asset is not in the new layout, delete it. + # Also check if the parent directory is empty, and delete that + # as well, if it is. + EditorAssetLibrary.delete_directory(ppath) + + parent = os.path.dirname(str(ppath)) + parent_content = EditorAssetLibrary.list_assets( + parent, recursive=False, include_folder=True + ) + + if len(parent_content) == 0: + EditorAssetLibrary.delete_directory(parent) + else: + # If the asset is in the new layout, search the instances in + # the JSON file, and create actors for them. + for element in data: + if element.get('reference_fbx') == ref: + if ref not in loaded: + loaded.append(ref) + + assets = EditorAssetLibrary.list_assets( + ppath, recursive=True, include_folder=False) + + transform = element.get('transform') + family = element.get('family') + + if family == 'model': + self._process_family( + assets, 'StaticMesh', transform) + elif family == 'rig': + self._process_family( + assets, 'SkeletalMesh', transform) + + self._process(source_path, destination_path, loaded) + + container_path = "{}/{}".format(container["namespace"], + container["objectName"]) + # update metadata + unreal_pipeline.imprint( + container_path, + { + "representation": str(representation["_id"]), + "parent": str(representation["parent"]) + }) + + asset_content = EditorAssetLibrary.list_assets( + destination_path, recursive=True, include_folder=False) + + for a in asset_content: + EditorAssetLibrary.save_asset(a) + + def remove(self, container): + """ + First, destroy all actors of the assets to be removed. Then, deletes + the asset's directory. + """ + path = container["namespace"] + parent_path = os.path.dirname(path) + + self._remove_actors(path) + + EditorAssetLibrary.delete_directory(path) + + asset_content = EditorAssetLibrary.list_assets( + parent_path, recursive=False + ) + + if len(asset_content) == 0: + EditorAssetLibrary.delete_directory(parent_path) diff --git a/openpype/hosts/unreal/plugins/load/load_rig.py b/openpype/hosts/unreal/plugins/load/load_rig.py index 7f6e31618a..c7d095aa21 100644 --- a/openpype/hosts/unreal/plugins/load/load_rig.py +++ b/openpype/hosts/unreal/plugins/load/load_rig.py @@ -15,7 +15,7 @@ class SkeletalMeshFBXLoader(api.Loader): icon = "cube" color = "orange" - def load(self, context, name, namespace, data): + def load(self, context, name, namespace, options): """ Load and containerise representation into Content Browser. @@ -40,6 +40,8 @@ class SkeletalMeshFBXLoader(api.Loader): # Create directory for asset and avalon container root = "/Game/Avalon/Assets" + if options and options.get("asset_dir"): + root = options["asset_dir"] asset = context.get('asset').get('name') suffix = "_CON" if asset: diff --git a/openpype/hosts/unreal/plugins/load/load_staticmeshfbx.py b/openpype/hosts/unreal/plugins/load/load_staticmeshfbx.py index d25f84ea69..510c4331ad 100644 --- a/openpype/hosts/unreal/plugins/load/load_staticmeshfbx.py +++ b/openpype/hosts/unreal/plugins/load/load_staticmeshfbx.py @@ -40,7 +40,7 @@ class StaticMeshFBXLoader(api.Loader): return task - def load(self, context, name, namespace, data): + def load(self, context, name, namespace, options): """ Load and containerise representation into Content Browser. @@ -65,6 +65,8 @@ class StaticMeshFBXLoader(api.Loader): # Create directory for asset and avalon container root = "/Game/Avalon/Assets" + if options and options.get("asset_dir"): + root = options["asset_dir"] asset = context.get('asset').get('name') suffix = "_CON" if asset: From 6026b4b955e7c53153b570016cae7a6f14db1d8b Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 23 Sep 2021 16:34:23 +0100 Subject: [PATCH 002/123] Fix for minor problem when handling assets in Blender with layout --- openpype/hosts/blender/plugins/load/load_model.py | 7 +++++-- openpype/hosts/blender/plugins/load/load_rig.py | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/blender/plugins/load/load_model.py b/openpype/hosts/blender/plugins/load/load_model.py index af5591c299..6097fab7cd 100644 --- a/openpype/hosts/blender/plugins/load/load_model.py +++ b/openpype/hosts/blender/plugins/load/load_model.py @@ -81,7 +81,8 @@ class BlendModelLoader(plugin.AssetLoader): plugin.prepare_data(local_obj.data, group_name) for material_slot in local_obj.material_slots: - plugin.prepare_data(material_slot.material, group_name) + if material_slot.material: + plugin.prepare_data(material_slot.material, group_name) if not local_obj.get(AVALON_PROPERTY): local_obj[AVALON_PROPERTY] = dict() @@ -245,7 +246,8 @@ class BlendModelLoader(plugin.AssetLoader): # If it is the last object to use that library, remove it if count == 1: library = bpy.data.libraries.get(bpy.path.basename(group_libpath)) - bpy.data.libraries.remove(library) + if library: + bpy.data.libraries.remove(library) self._process(str(libpath), asset_group, object_name) @@ -253,6 +255,7 @@ class BlendModelLoader(plugin.AssetLoader): metadata["libpath"] = str(libpath) metadata["representation"] = str(representation["_id"]) + metadata["parent"] = str(representation["parent"]) def exec_remove(self, container: Dict) -> bool: """Remove an existing container from a Blender scene. diff --git a/openpype/hosts/blender/plugins/load/load_rig.py b/openpype/hosts/blender/plugins/load/load_rig.py index 5573c081e1..8c8a2a2324 100644 --- a/openpype/hosts/blender/plugins/load/load_rig.py +++ b/openpype/hosts/blender/plugins/load/load_rig.py @@ -320,6 +320,7 @@ class BlendRigLoader(plugin.AssetLoader): metadata["libpath"] = str(libpath) metadata["representation"] = str(representation["_id"]) + metadata["parent"] = str(representation["parent"]) def exec_remove(self, container: Dict) -> bool: """Remove an existing asset group from a Blender scene. From d63e1caedef3ca48237f768c42b57b07fdb3e8fb Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 23 Sep 2021 17:02:49 +0100 Subject: [PATCH 003/123] Hound fixes --- .../hosts/unreal/plugins/load/load_layout.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/openpype/hosts/unreal/plugins/load/load_layout.py b/openpype/hosts/unreal/plugins/load/load_layout.py index 0419fb3759..e51e760776 100644 --- a/openpype/hosts/unreal/plugins/load/load_layout.py +++ b/openpype/hosts/unreal/plugins/load/load_layout.py @@ -75,13 +75,14 @@ class LayoutLoader(api.Loader): ), False) actor.set_actor_scale3d(transform.get('scale')) - def _process(self, libpath, asset_dir, loaded = []): + def _process(self, libpath, asset_dir, loaded=None): with open(libpath, "r") as fp: data = json.load(fp) all_loaders = api.discover(api.Loader) - # loaded = [] + if not loaded: + loaded = [] for element in data: reference = element.get('reference_fbx') @@ -113,7 +114,7 @@ class LayoutLoader(api.Loader): ) instances = [ - item for item in data + item for item in data if item.get('reference_fbx') == reference] for instance in instances: @@ -143,10 +144,10 @@ class LayoutLoader(api.Loader): # Get all the static and skeletal meshes components in the level components = EditorLevelLibrary.get_all_level_actors_components() static_meshes_comp = [ - c for c in components + c for c in components if c.get_class().get_name() == 'StaticMeshComponent'] skel_meshes_comp = [ - c for c in components + c for c in components if c.get_class().get_name() == 'SkeletalMeshComponent'] # For all the asset containers, get the static and skeletal meshes. @@ -246,12 +247,12 @@ class LayoutLoader(api.Loader): asset_containers = self._get_asset_containers(destination_path) loaded = [] - # Delete all the assets imported with the previous version of the + # Delete all the assets imported with the previous version of the # layout, if they're not in the new layout. for asset_container in asset_containers: if asset_container.get_editor_property( - 'asset_name') == container["objectName"]: - continue + 'asset_name') == container["objectName"]: + continue ref = EditorAssetLibrary.get_metadata_tag( asset_container.get_asset(), 'representation') ppath = asset_container.get_editor_property('package_path') @@ -270,7 +271,7 @@ class LayoutLoader(api.Loader): if len(parent_content) == 0: EditorAssetLibrary.delete_directory(parent) else: - # If the asset is in the new layout, search the instances in + # If the asset is in the new layout, search the instances in # the JSON file, and create actors for them. for element in data: if element.get('reference_fbx') == ref: From db23c995e23c2ac14f39b39fa265873996ff1305 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Wed, 13 Oct 2021 17:29:31 +0100 Subject: [PATCH 004/123] Layout now includes animations --- .../hosts/blender/plugins/load/load_rig.py | 2 + .../blender/plugins/publish/extract_layout.py | 122 +++++++++++- .../hosts/unreal/plugins/load/load_layout.py | 185 +++++++++++++++--- 3 files changed, 271 insertions(+), 38 deletions(-) diff --git a/openpype/hosts/blender/plugins/load/load_rig.py b/openpype/hosts/blender/plugins/load/load_rig.py index 2d974a3205..4e92704703 100644 --- a/openpype/hosts/blender/plugins/load/load_rig.py +++ b/openpype/hosts/blender/plugins/load/load_rig.py @@ -110,6 +110,8 @@ class BlendRigLoader(plugin.AssetLoader): plugin.prepare_data(local_obj.data, group_name) if action is not None: + if local_obj.animation_data is None: + local_obj.animation_data_create() local_obj.animation_data.action = action elif (local_obj.animation_data and local_obj.animation_data.action is not None): diff --git a/openpype/hosts/blender/plugins/publish/extract_layout.py b/openpype/hosts/blender/plugins/publish/extract_layout.py index f54215800f..54656dc7fd 100644 --- a/openpype/hosts/blender/plugins/publish/extract_layout.py +++ b/openpype/hosts/blender/plugins/publish/extract_layout.py @@ -2,9 +2,12 @@ import os import json import bpy +import bpy_extras +import bpy_extras.anim_utils from avalon import io from avalon.blender.pipeline import AVALON_PROPERTY +from openpype.hosts.blender.api import plugin import openpype.api @@ -16,6 +19,99 @@ class ExtractLayout(openpype.api.Extractor): families = ["layout"] optional = True + def _export_animation(self, asset, instance, stagingdir): + file_names = [] + + for obj in asset.children: + if obj.type != "ARMATURE": + continue + + asset_group_name = asset.name + asset.name = asset.get(AVALON_PROPERTY).get("asset_name") + + armature_name = obj.name + original_name = armature_name.split(':')[1] + obj.name = original_name + + object_action_pairs = [] + original_actions = [] + + starting_frames = [] + ending_frames = [] + + # For each armature, we make a copy of the current action + curr_action = None + copy_action = None + + if obj.animation_data and obj.animation_data.action: + curr_action = obj.animation_data.action + copy_action = curr_action.copy() + + curr_frame_range = curr_action.frame_range + + starting_frames.append(curr_frame_range[0]) + ending_frames.append(curr_frame_range[1]) + else: + self.log.info("Object have no animation.") + continue + + object_action_pairs.append((obj, copy_action)) + original_actions.append(curr_action) + + # We compute the starting and ending frames + max_frame = min(starting_frames) + min_frame = max(ending_frames) + + # We bake the copy of the current action for each object + bpy_extras.anim_utils.bake_action_objects( + object_action_pairs, + frames=range(int(min_frame), int(max_frame)), + do_object=False, + do_clean=False + ) + + for o in bpy.data.objects: + o.select_set(False) + + asset.select_set(True) + obj.select_set(True) + fbx_filename = f"{instance.name}_{asset_group_name}.fbx" + filepath = os.path.join(stagingdir, fbx_filename) + + override = plugin.create_blender_context( + active=asset, selected=[asset, obj]) + bpy.ops.export_scene.fbx( + override, + filepath=filepath, + use_active_collection=False, + use_selection=True, + bake_anim_use_nla_strips=False, + bake_anim_use_all_actions=False, + add_leaf_bones=False, + armature_nodetype='ROOT', + object_types={'EMPTY', 'ARMATURE'} + ) + obj.name = armature_name + asset.name = asset_group_name + asset.select_set(False) + obj.select_set(False) + + # We delete the baked action and set the original one back + for i in range(0, len(object_action_pairs)): + pair = object_action_pairs[i] + action = original_actions[i] + + if action: + pair[0].animation_data.action = action + + if pair[1]: + pair[1].user_clear() + bpy.data.actions.remove(pair[1]) + + file_names.append(fbx_filename) + + return file_names + def process(self, instance): # Define extract output file path stagingdir = self.staging_dir(instance) @@ -23,7 +119,11 @@ class ExtractLayout(openpype.api.Extractor): # Perform extraction self.log.info("Performing extraction..") + if "representations" not in instance.data: + instance.data["representations"] = [] + json_data = [] + fbx_files = [] asset_group = bpy.data.objects[str(instance)] @@ -78,22 +178,32 @@ class ExtractLayout(openpype.api.Extractor): } json_data.append(json_element) + # Extract the animation as well + if family == "rig": + fbx_files.extend( + self._export_animation( + asset, instance, stagingdir)) + json_filename = "{}.json".format(instance.name) json_path = os.path.join(stagingdir, json_filename) with open(json_path, "w+") as file: json.dump(json_data, fp=file, indent=2) - if "representations" not in instance.data: - instance.data["representations"] = [] - - representation = { + json_representation = { 'name': 'json', 'ext': 'json', 'files': json_filename, "stagingDir": stagingdir, } - instance.data["representations"].append(representation) + fbx_representation = { + 'name': 'fbx', + 'ext': 'fbx', + 'files': fbx_files, + "stagingDir": stagingdir, + } + instance.data["representations"].append(json_representation) + instance.data["representations"].append(fbx_representation) self.log.info("Extracted instance '%s' to: %s", - instance.name, representation) + instance.name, json_representation) diff --git a/openpype/hosts/unreal/plugins/load/load_layout.py b/openpype/hosts/unreal/plugins/load/load_layout.py index e51e760776..77691949bf 100644 --- a/openpype/hosts/unreal/plugins/load/load_layout.py +++ b/openpype/hosts/unreal/plugins/load/load_layout.py @@ -1,9 +1,12 @@ import os import json +from pathlib import Path import unreal from unreal import EditorAssetLibrary from unreal import EditorLevelLibrary +from unreal import AssetToolsHelpers +from unreal import FBXImportType from unreal import MathLibrary as umath from avalon import api, pipeline @@ -58,6 +61,8 @@ class LayoutLoader(api.Loader): def _process_family(self, assets, classname, transform): ar = unreal.AssetRegistryHelpers.get_asset_registry() + actors = [] + for asset in assets: obj = ar.get_asset_by_object_path(asset).get_asset() if obj.get_class().get_name() == classname: @@ -75,7 +80,91 @@ class LayoutLoader(api.Loader): ), False) actor.set_actor_scale3d(transform.get('scale')) + actors.append(actor) + + return actors + + def _import_animation( + self, asset_dir, path, rig_count, instance_name, skeleton, + actors_dict): + anim_path = f"{asset_dir}/animations/{path.with_suffix('').name}_{rig_count:02d}" + + # Import animation + task = unreal.AssetImportTask() + task.options = unreal.FbxImportUI() + + task.set_editor_property( + 'filename', str(path.with_suffix(f".{rig_count:02d}.fbx"))) + task.set_editor_property('destination_path', anim_path) + task.set_editor_property( + 'destination_name', f"{instance_name}_animation") + task.set_editor_property('replace_existing', False) + task.set_editor_property('automated', True) + task.set_editor_property('save', False) + + # set import options here + task.options.set_editor_property( + 'automated_import_should_detect_type', False) + task.options.set_editor_property( + 'original_import_type', FBXImportType.FBXIT_SKELETAL_MESH) + task.options.set_editor_property( + 'mesh_type_to_import', FBXImportType.FBXIT_ANIMATION) + task.options.set_editor_property('import_mesh', False) + task.options.set_editor_property('import_animations', True) + task.options.set_editor_property('override_full_name', True) + task.options.set_editor_property('skeleton', skeleton) + + task.options.anim_sequence_import_data.set_editor_property( + 'animation_length', + unreal.FBXAnimationLengthImportType.FBXALIT_EXPORTED_TIME + ) + task.options.anim_sequence_import_data.set_editor_property( + 'import_meshes_in_bone_hierarchy', False) + task.options.anim_sequence_import_data.set_editor_property( + 'use_default_sample_rate', True) + task.options.anim_sequence_import_data.set_editor_property( + 'import_custom_attribute', True) + task.options.anim_sequence_import_data.set_editor_property( + 'import_bone_tracks', True) + task.options.anim_sequence_import_data.set_editor_property( + 'remove_redundant_keys', True) + task.options.anim_sequence_import_data.set_editor_property( + 'convert_scene', True) + + AssetToolsHelpers.get_asset_tools().import_asset_tasks([task]) + + asset_content = unreal.EditorAssetLibrary.list_assets( + anim_path, recursive=False, include_folder=False + ) + + animation = None + + for a in asset_content: + unreal.EditorAssetLibrary.save_asset(a) + imported_asset_data = unreal.EditorAssetLibrary.find_asset_data(a) + imported_asset = unreal.AssetRegistryHelpers.get_asset( + imported_asset_data) + if imported_asset.__class__ == unreal.AnimSequence: + animation = imported_asset + break + + if animation: + actor = None + if actors_dict.get(instance_name): + for a in actors_dict.get(instance_name): + if a.get_class().get_name() == 'SkeletalMeshActor': + actor = a + break + + animation.set_editor_property('enable_root_motion', True) + actor.skeletal_mesh_component.set_editor_property( + 'animation_mode', unreal.AnimationMode.ANIMATION_SINGLE_NODE) + actor.skeletal_mesh_component.animation_data.set_editor_property( + 'anim_to_play', animation) + def _process(self, libpath, asset_dir, loaded=None): + ar = unreal.AssetRegistryHelpers.get_asset_registry() + with open(libpath, "r") as fp: data = json.load(fp) @@ -84,46 +173,78 @@ class LayoutLoader(api.Loader): if not loaded: loaded = [] + path = Path(libpath) + rig_count = 0 + + skeleton_dict = {} + actors_dict = {} + for element in data: reference = element.get('reference_fbx') - - if reference in loaded: - continue - - loaded.append(reference) - - family = element.get('family') - loaders = api.loaders_from_representation( - all_loaders, reference) - loader = self._get_loader(loaders, family) - - if not loader: - continue - instance_name = element.get('instance_name') - options = { - "asset_dir": asset_dir - } + skeleton = None - assets = api.load( - loader, - reference, - namespace=instance_name, - options=options - ) + if reference not in loaded: + loaded.append(reference) - instances = [ - item for item in data - if item.get('reference_fbx') == reference] + family = element.get('family') + loaders = api.loaders_from_representation( + all_loaders, reference) + loader = self._get_loader(loaders, family) - for instance in instances: - transform = instance.get('transform') + if not loader: + continue - if family == 'model': - self._process_family(assets, 'StaticMesh', transform) - elif family == 'rig': - self._process_family(assets, 'SkeletalMesh', transform) + options = { + "asset_dir": asset_dir + } + + assets = api.load( + loader, + reference, + namespace=instance_name, + options=options + ) + + instances = [ + item for item in data + if item.get('reference_fbx') == reference] + + for instance in instances: + transform = instance.get('transform') + inst = instance.get('instance_name') + + actors = [] + + if family == 'model': + actors = self._process_family( + assets, 'StaticMesh', transform) + elif family == 'rig': + actors = self._process_family( + assets, 'SkeletalMesh', transform) + actors_dict[inst] = actors + + if family == 'rig': + # Finds skeleton among the imported assets + for asset in assets: + obj = ar.get_asset_by_object_path(asset).get_asset() + if obj.get_class().get_name() == 'Skeleton': + skeleton = obj + if skeleton: + break + + if skeleton: + skeleton_dict[reference] = skeleton + else: + skeleton = skeleton_dict.get(reference) + + if skeleton: + self._import_animation( + asset_dir, path, rig_count, instance_name, skeleton, + actors_dict) + + rig_count += 1 def _remove_family(self, assets, components, classname, propname): ar = unreal.AssetRegistryHelpers.get_asset_registry() From de468b34fafcd9455927292494dc4c2cb7edf3dc Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 14 Oct 2021 15:53:46 +0100 Subject: [PATCH 005/123] Fixed problem with object names if export fails --- .../plugins/publish/extract_fbx_animation.py | 14 +++++++------- .../blender/plugins/publish/extract_layout.py | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/openpype/hosts/blender/plugins/publish/extract_fbx_animation.py b/openpype/hosts/blender/plugins/publish/extract_fbx_animation.py index 16443b760c..96fa37c07e 100644 --- a/openpype/hosts/blender/plugins/publish/extract_fbx_animation.py +++ b/openpype/hosts/blender/plugins/publish/extract_fbx_animation.py @@ -37,13 +37,6 @@ class ExtractAnimationFBX(api.Extractor): armature = [ obj for obj in asset_group.children if obj.type == 'ARMATURE'][0] - asset_group_name = asset_group.name - asset_group.name = asset_group.get(AVALON_PROPERTY).get("asset_name") - - armature_name = armature.name - original_name = armature_name.split(':')[1] - armature.name = original_name - object_action_pairs = [] original_actions = [] @@ -66,6 +59,13 @@ class ExtractAnimationFBX(api.Extractor): self.log.info("Object have no animation.") return + asset_group_name = asset_group.name + asset_group.name = asset_group.get(AVALON_PROPERTY).get("asset_name") + + armature_name = armature.name + original_name = armature_name.split(':')[1] + armature.name = original_name + object_action_pairs.append((armature, copy_action)) original_actions.append(curr_action) diff --git a/openpype/hosts/blender/plugins/publish/extract_layout.py b/openpype/hosts/blender/plugins/publish/extract_layout.py index 54656dc7fd..93df5fe01c 100644 --- a/openpype/hosts/blender/plugins/publish/extract_layout.py +++ b/openpype/hosts/blender/plugins/publish/extract_layout.py @@ -26,13 +26,6 @@ class ExtractLayout(openpype.api.Extractor): if obj.type != "ARMATURE": continue - asset_group_name = asset.name - asset.name = asset.get(AVALON_PROPERTY).get("asset_name") - - armature_name = obj.name - original_name = armature_name.split(':')[1] - obj.name = original_name - object_action_pairs = [] original_actions = [] @@ -55,6 +48,13 @@ class ExtractLayout(openpype.api.Extractor): self.log.info("Object have no animation.") continue + asset_group_name = asset.name + asset.name = asset.get(AVALON_PROPERTY).get("asset_name") + + armature_name = obj.name + original_name = armature_name.split(':')[1] + obj.name = original_name + object_action_pairs.append((obj, copy_action)) original_actions.append(curr_action) From e7f6bf03209b6813046bd078fd912581d4c46efb Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 14 Oct 2021 15:55:51 +0100 Subject: [PATCH 006/123] Changed how the fbx animations are handled. There was a problem with no animations or if only some of the rigs were animated. Now, the animation file is referenced in the json. --- .../blender/plugins/publish/extract_layout.py | 50 +++++++++++++------ .../hosts/unreal/plugins/load/load_layout.py | 23 +++++---- 2 files changed, 47 insertions(+), 26 deletions(-) diff --git a/openpype/hosts/blender/plugins/publish/extract_layout.py b/openpype/hosts/blender/plugins/publish/extract_layout.py index 93df5fe01c..804004bf4e 100644 --- a/openpype/hosts/blender/plugins/publish/extract_layout.py +++ b/openpype/hosts/blender/plugins/publish/extract_layout.py @@ -19,8 +19,8 @@ class ExtractLayout(openpype.api.Extractor): families = ["layout"] optional = True - def _export_animation(self, asset, instance, stagingdir): - file_names = [] + def _export_animation(self, asset, instance, stagingdir, fbx_count): + n = fbx_count for obj in asset.children: if obj.type != "ARMATURE": @@ -75,7 +75,7 @@ class ExtractLayout(openpype.api.Extractor): asset.select_set(True) obj.select_set(True) - fbx_filename = f"{instance.name}_{asset_group_name}.fbx" + fbx_filename = f"{n:03d}.fbx" filepath = os.path.join(stagingdir, fbx_filename) override = plugin.create_blender_context( @@ -108,9 +108,9 @@ class ExtractLayout(openpype.api.Extractor): pair[1].user_clear() bpy.data.actions.remove(pair[1]) - file_names.append(fbx_filename) + return fbx_filename, n + 1 - return file_names + return None, n def process(self, instance): # Define extract output file path @@ -127,6 +127,8 @@ class ExtractLayout(openpype.api.Extractor): asset_group = bpy.data.objects[str(instance)] + fbx_count = 0 + for asset in asset_group.children: metadata = asset.get(AVALON_PROPERTY) @@ -176,13 +178,17 @@ class ExtractLayout(openpype.api.Extractor): "z": asset.scale.z } } - json_data.append(json_element) # Extract the animation as well if family == "rig": - fbx_files.extend( - self._export_animation( - asset, instance, stagingdir)) + f, n = self._export_animation( + asset, instance, stagingdir, fbx_count) + if f: + fbx_files.append(f) + json_element["animation"] = f + fbx_count = n + + json_data.append(json_element) json_filename = "{}.json".format(instance.name) json_path = os.path.join(stagingdir, json_filename) @@ -196,14 +202,26 @@ class ExtractLayout(openpype.api.Extractor): 'files': json_filename, "stagingDir": stagingdir, } - fbx_representation = { - 'name': 'fbx', - 'ext': 'fbx', - 'files': fbx_files, - "stagingDir": stagingdir, - } instance.data["representations"].append(json_representation) - instance.data["representations"].append(fbx_representation) + + self.log.debug(fbx_files) + + if len(fbx_files) == 1: + fbx_representation = { + 'name': 'fbx', + 'ext': 'fbx', + 'files': fbx_files[0], + "stagingDir": stagingdir, + } + instance.data["representations"].append(fbx_representation) + elif len(fbx_files) > 1: + fbx_representation = { + 'name': 'fbx', + 'ext': 'fbx', + 'files': fbx_files, + "stagingDir": stagingdir, + } + instance.data["representations"].append(fbx_representation) self.log.info("Extracted instance '%s' to: %s", instance.name, json_representation) diff --git a/openpype/hosts/unreal/plugins/load/load_layout.py b/openpype/hosts/unreal/plugins/load/load_layout.py index 77691949bf..0ef24e42f4 100644 --- a/openpype/hosts/unreal/plugins/load/load_layout.py +++ b/openpype/hosts/unreal/plugins/load/load_layout.py @@ -85,16 +85,19 @@ class LayoutLoader(api.Loader): return actors def _import_animation( - self, asset_dir, path, rig_count, instance_name, skeleton, - actors_dict): - anim_path = f"{asset_dir}/animations/{path.with_suffix('').name}_{rig_count:02d}" + self, asset_dir, path, instance_name, skeleton, actors_dict, + animation_file): + anim_file = Path(animation_file) + anim_file_name = anim_file.with_suffix('') + + anim_path = f"{asset_dir}/animations/{anim_file_name}" # Import animation task = unreal.AssetImportTask() task.options = unreal.FbxImportUI() task.set_editor_property( - 'filename', str(path.with_suffix(f".{rig_count:02d}.fbx"))) + 'filename', str(path.with_suffix(f".{animation_file}"))) task.set_editor_property('destination_path', anim_path) task.set_editor_property( 'destination_name', f"{instance_name}_animation") @@ -174,7 +177,6 @@ class LayoutLoader(api.Loader): loaded = [] path = Path(libpath) - rig_count = 0 skeleton_dict = {} actors_dict = {} @@ -239,12 +241,12 @@ class LayoutLoader(api.Loader): else: skeleton = skeleton_dict.get(reference) - if skeleton: - self._import_animation( - asset_dir, path, rig_count, instance_name, skeleton, - actors_dict) + animation_file = element.get('animation') - rig_count += 1 + if animation_file and skeleton: + self._import_animation( + asset_dir, path, instance_name, skeleton, + actors_dict, animation_file) def _remove_family(self, assets, components, classname, propname): ar = unreal.AssetRegistryHelpers.get_asset_registry() @@ -356,6 +358,7 @@ class LayoutLoader(api.Loader): return asset_content def update(self, container, representation): + assert False, "Update not working for now. Delete and reload the layout." source_path = api.get_representation_path(representation) destination_path = container["namespace"] From f810e68cf9295f90908933cfb82e8b4bb7fd5492 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Mon, 18 Oct 2021 16:11:45 +0100 Subject: [PATCH 007/123] Blender: increment workfile version for layouts as well --- .../hosts/blender/plugins/publish/increment_workfile_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/blender/plugins/publish/increment_workfile_version.py b/openpype/hosts/blender/plugins/publish/increment_workfile_version.py index db73842323..32cbcf0834 100644 --- a/openpype/hosts/blender/plugins/publish/increment_workfile_version.py +++ b/openpype/hosts/blender/plugins/publish/increment_workfile_version.py @@ -9,7 +9,7 @@ class IncrementWorkfileVersion(pyblish.api.ContextPlugin): label = "Increment Workfile Version" optional = True hosts = ["blender"] - families = ["animation", "model", "rig", "action"] + families = ["animation", "model", "rig", "action", "layout"] def process(self, context): From ef14d4269b8de07d5c4872717f6ca7eefdb24a1f Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Mon, 18 Oct 2021 16:12:17 +0100 Subject: [PATCH 008/123] Blender: added validation for object mode to layout tasks --- .../hosts/blender/plugins/publish/validate_object_mode.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/blender/plugins/publish/validate_object_mode.py b/openpype/hosts/blender/plugins/publish/validate_object_mode.py index 1c82628c1c..90ef0b7c41 100644 --- a/openpype/hosts/blender/plugins/publish/validate_object_mode.py +++ b/openpype/hosts/blender/plugins/publish/validate_object_mode.py @@ -5,15 +5,15 @@ import openpype.hosts.blender.api.action class ValidateObjectIsInObjectMode(pyblish.api.InstancePlugin): - """Validate that the current object is in Object Mode.""" + """Validate that the objects in the instance are in Object Mode.""" order = pyblish.api.ValidatorOrder - 0.01 hosts = ["blender"] - families = ["model", "rig"] + families = ["model", "rig", "layout"] category = "geometry" - label = "Object is in Object Mode" + label = "Validate Object Mode" actions = [openpype.hosts.blender.api.action.SelectInvalidAction] - optional = True + optional = False @classmethod def get_invalid(cls, instance) -> List: From cb9b11e7260c41d9abca8792f74a6b81027dcc48 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Wed, 27 Oct 2021 15:39:56 +0100 Subject: [PATCH 009/123] Implemented update for layouts with animations --- .../hosts/unreal/plugins/load/load_layout.py | 70 +++++++++++++++---- 1 file changed, 58 insertions(+), 12 deletions(-) diff --git a/openpype/hosts/unreal/plugins/load/load_layout.py b/openpype/hosts/unreal/plugins/load/load_layout.py index 0ef24e42f4..af80a2bae6 100644 --- a/openpype/hosts/unreal/plugins/load/load_layout.py +++ b/openpype/hosts/unreal/plugins/load/load_layout.py @@ -358,12 +358,18 @@ class LayoutLoader(api.Loader): return asset_content def update(self, container, representation): - assert False, "Update not working for now. Delete and reload the layout." + ar = unreal.AssetRegistryHelpers.get_asset_registry() + source_path = api.get_representation_path(representation) destination_path = container["namespace"] + libpath = Path(api.get_representation_path(representation)) self._remove_actors(destination_path) + # Delete old animations + anim_path = f"{destination_path}/animations/" + EditorAssetLibrary.delete_directory(anim_path) + with open(source_path, "r") as fp: data = json.load(fp) @@ -397,23 +403,63 @@ class LayoutLoader(api.Loader): else: # If the asset is in the new layout, search the instances in # the JSON file, and create actors for them. + + actors_dict = {} + skeleton_dict = {} + for element in data: - if element.get('reference_fbx') == ref: - if ref not in loaded: - loaded.append(ref) + reference = element.get('reference_fbx') + instance_name = element.get('instance_name') + + skeleton = None + + if reference == ref and ref not in loaded: + loaded.append(ref) + + family = element.get('family') assets = EditorAssetLibrary.list_assets( ppath, recursive=True, include_folder=False) - transform = element.get('transform') - family = element.get('family') + instances = [ + item for item in data + if item.get('reference_fbx') == reference] - if family == 'model': - self._process_family( - assets, 'StaticMesh', transform) - elif family == 'rig': - self._process_family( - assets, 'SkeletalMesh', transform) + for instance in instances: + transform = instance.get('transform') + inst = instance.get('instance_name') + + actors = [] + + if family == 'model': + actors = self._process_family( + assets, 'StaticMesh', transform) + elif family == 'rig': + actors = self._process_family( + assets, 'SkeletalMesh', transform) + actors_dict[inst] = actors + + if family == 'rig': + # Finds skeleton among the imported assets + for asset in assets: + obj = ar.get_asset_by_object_path(asset).get_asset() + if obj.get_class().get_name() == 'Skeleton': + skeleton = obj + if skeleton: + break + + if skeleton: + skeleton_dict[reference] = skeleton + else: + skeleton = skeleton_dict.get(reference) + + animation_file = element.get('animation') + + if animation_file and skeleton: + self._import_animation( + destination_path, libpath, + instance_name, skeleton, + actors_dict, animation_file) self._process(source_path, destination_path, loaded) From 14e2c07be43ae9a7e9661c868a396c4c087d86f9 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Tue, 9 Nov 2021 10:03:57 +0000 Subject: [PATCH 010/123] Unreal changes the name of the actor to the instance name in the JSON This is needed to keep the actors in Unreal mirrored to the Blender scene --- .../hosts/unreal/plugins/load/load_layout.py | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/unreal/plugins/load/load_layout.py b/openpype/hosts/unreal/plugins/load/load_layout.py index af80a2bae6..c32c810c36 100644 --- a/openpype/hosts/unreal/plugins/load/load_layout.py +++ b/openpype/hosts/unreal/plugins/load/load_layout.py @@ -58,7 +58,7 @@ class LayoutLoader(api.Loader): return None - def _process_family(self, assets, classname, transform): + def _process_family(self, assets, classname, transform, inst_name=None): ar = unreal.AssetRegistryHelpers.get_asset_registry() actors = [] @@ -70,6 +70,17 @@ class LayoutLoader(api.Loader): obj, transform.get('translation') ) + if inst_name: + try: + # Rename method leads to crash + # actor.rename(name=inst_name) + + # The label works, although it make it slightly more + # complicated to check for the names, as we need to + # loop through all the actors in the level + actor.set_actor_label(inst_name) + except Exception as e: + print(e) actor.set_actor_rotation(unreal.Rotator( umath.radians_to_degrees( transform.get('rotation').get('x')), @@ -221,10 +232,10 @@ class LayoutLoader(api.Loader): if family == 'model': actors = self._process_family( - assets, 'StaticMesh', transform) + assets, 'StaticMesh', transform, inst) elif family == 'rig': actors = self._process_family( - assets, 'SkeletalMesh', transform) + assets, 'SkeletalMesh', transform, inst) actors_dict[inst] = actors if family == 'rig': @@ -433,16 +444,17 @@ class LayoutLoader(api.Loader): if family == 'model': actors = self._process_family( - assets, 'StaticMesh', transform) + assets, 'StaticMesh', transform, inst) elif family == 'rig': actors = self._process_family( - assets, 'SkeletalMesh', transform) + assets, 'SkeletalMesh', transform, inst) actors_dict[inst] = actors if family == 'rig': # Finds skeleton among the imported assets for asset in assets: - obj = ar.get_asset_by_object_path(asset).get_asset() + obj = ar.get_asset_by_object_path( + asset).get_asset() if obj.get_class().get_name() == 'Skeleton': skeleton = obj if skeleton: From 38ce006a0ee73cf1241b996c114bcd352ca35acb Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Tue, 9 Nov 2021 10:05:35 +0000 Subject: [PATCH 011/123] Blender now loads the animation included with the layout --- .../blender/plugins/load/load_layout_json.py | 4 ++++ .../hosts/blender/plugins/load/load_rig.py | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/openpype/hosts/blender/plugins/load/load_layout_json.py b/openpype/hosts/blender/plugins/load/load_layout_json.py index 442cf05d85..281343924a 100644 --- a/openpype/hosts/blender/plugins/load/load_layout_json.py +++ b/openpype/hosts/blender/plugins/load/load_layout_json.py @@ -92,6 +92,10 @@ class JsonLayoutLoader(plugin.AssetLoader): 'animation_asset': asset } + if element.get('animation'): + options['animation_file'] = str(Path(libpath).with_suffix( + '')) + "." + element.get('animation') + # This should return the loaded asset, but the load call will be # added to the queue to run in the Blender main thread, so # at this time it will not return anything. The assets will be diff --git a/openpype/hosts/blender/plugins/load/load_rig.py b/openpype/hosts/blender/plugins/load/load_rig.py index 07ab5ce6d6..f5c9d8edc5 100644 --- a/openpype/hosts/blender/plugins/load/load_rig.py +++ b/openpype/hosts/blender/plugins/load/load_rig.py @@ -7,6 +7,7 @@ from typing import Dict, List, Optional import bpy from avalon import api +from avalon.blender import lib as avalon_lib from avalon.blender.pipeline import AVALON_CONTAINERS from avalon.blender.pipeline import AVALON_CONTAINER_ID from avalon.blender.pipeline import AVALON_PROPERTY @@ -196,12 +197,14 @@ class BlendRigLoader(plugin.AssetLoader): plugin.deselect_all() create_animation = False + anim_file = None if options is not None: parent = options.get('parent') transform = options.get('transform') action = options.get('action') create_animation = options.get('create_animation') + anim_file = options.get('animation_file') if parent and transform: location = transform.get('translation') @@ -254,6 +257,26 @@ class BlendRigLoader(plugin.AssetLoader): plugin.deselect_all() + if anim_file: + bpy.ops.import_scene.fbx(filepath=anim_file) + + imported = avalon_lib.get_selection() + + armature = [ + o for o in asset_group.children if o.type == 'ARMATURE'][0] + + imported_group = [ + o for o in imported if o.type == 'EMPTY'][0] + + for obj in imported: + if obj.type == 'ARMATURE': + if not armature.animation_data: + armature.animation_data_create() + armature.animation_data.action = obj.animation_data.action + + self._remove(imported_group) + bpy.data.objects.remove(imported_group) + bpy.context.scene.collection.objects.link(asset_group) asset_group[AVALON_PROPERTY] = { From e7fbefd6f2b5b563639ed3a61bcd9f11ad141645 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Tue, 9 Nov 2021 12:28:09 +0000 Subject: [PATCH 012/123] Added parameter to fbx import for layout animation in Blender --- openpype/hosts/blender/plugins/load/load_rig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/blender/plugins/load/load_rig.py b/openpype/hosts/blender/plugins/load/load_rig.py index f5c9d8edc5..7e3cde1735 100644 --- a/openpype/hosts/blender/plugins/load/load_rig.py +++ b/openpype/hosts/blender/plugins/load/load_rig.py @@ -258,7 +258,7 @@ class BlendRigLoader(plugin.AssetLoader): plugin.deselect_all() if anim_file: - bpy.ops.import_scene.fbx(filepath=anim_file) + bpy.ops.import_scene.fbx(filepath=anim_file, anim_offset=0.0) imported = avalon_lib.get_selection() From 92d2bee2d4a85702c02b8cb2e9c3203a2bc38394 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Wed, 10 Nov 2021 10:39:26 +0000 Subject: [PATCH 013/123] Unreal can now loads animations to layout previously loaded --- .../hosts/unreal/plugins/load/load_animation.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/unreal/plugins/load/load_animation.py b/openpype/hosts/unreal/plugins/load/load_animation.py index 481285d603..f6037bee0a 100644 --- a/openpype/hosts/unreal/plugins/load/load_animation.py +++ b/openpype/hosts/unreal/plugins/load/load_animation.py @@ -71,8 +71,18 @@ class AnimationFBXLoader(api.Loader): if instance_name: automated = True - actor_name = 'PersistentLevel.' + instance_name - actor = unreal.EditorLevelLibrary.get_actor_reference(actor_name) + # Old method to get the actor + # actor_name = 'PersistentLevel.' + instance_name + # actor = unreal.EditorLevelLibrary.get_actor_reference(actor_name) + actors = unreal.EditorLevelLibrary.get_all_level_actors() + for a in actors: + if a.get_class().get_name() != "SkeletalMeshActor": + continue + if a.get_actor_label() == instance_name: + actor = a + break + if not actor: + raise Exception(f"Could not find actor {instance_name}") skeleton = actor.skeletal_mesh_component.skeletal_mesh.skeleton task.options.set_editor_property('skeleton', skeleton) From 578ab1c7f298246bcb36e7d347c50f6cc8188360 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Wed, 10 Nov 2021 16:39:00 +0000 Subject: [PATCH 014/123] Fixed problem if only one animation in the layout --- openpype/hosts/blender/plugins/publish/extract_layout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/blender/plugins/publish/extract_layout.py b/openpype/hosts/blender/plugins/publish/extract_layout.py index 804004bf4e..f397e70892 100644 --- a/openpype/hosts/blender/plugins/publish/extract_layout.py +++ b/openpype/hosts/blender/plugins/publish/extract_layout.py @@ -209,7 +209,7 @@ class ExtractLayout(openpype.api.Extractor): if len(fbx_files) == 1: fbx_representation = { 'name': 'fbx', - 'ext': 'fbx', + 'ext': '000.fbx', 'files': fbx_files[0], "stagingDir": stagingdir, } From d2ae004b494eafafa6f95df86989406493f45c66 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 11 Nov 2021 10:33:11 +0000 Subject: [PATCH 015/123] Disabled camera creation in Blender when loading layout from JSON --- .../blender/plugins/load/load_layout_json.py | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/openpype/hosts/blender/plugins/load/load_layout_json.py b/openpype/hosts/blender/plugins/load/load_layout_json.py index 281343924a..e09861859a 100644 --- a/openpype/hosts/blender/plugins/load/load_layout_json.py +++ b/openpype/hosts/blender/plugins/load/load_layout_json.py @@ -108,20 +108,22 @@ class JsonLayoutLoader(plugin.AssetLoader): options=options ) - # Create the camera asset and the camera instance - creator_plugin = lib.get_creator_by_name("CreateCamera") - if not creator_plugin: - raise ValueError("Creator plugin \"CreateCamera\" was " - "not found.") + # Camera creation when loading a layout is not necessary for now, + # but the code is worth keeping in case we need it in the future. + # # Create the camera asset and the camera instance + # creator_plugin = lib.get_creator_by_name("CreateCamera") + # if not creator_plugin: + # raise ValueError("Creator plugin \"CreateCamera\" was " + # "not found.") - api.create( - creator_plugin, - name="camera", - # name=f"{unique_number}_{subset}_animation", - asset=asset, - options={"useSelection": False} - # data={"dependencies": str(context["representation"]["_id"])} - ) + # api.create( + # creator_plugin, + # name="camera", + # # name=f"{unique_number}_{subset}_animation", + # asset=asset, + # options={"useSelection": False} + # # data={"dependencies": str(context["representation"]["_id"])} + # ) def process_asset(self, context: dict, From 41220adfcaf59f529f1fe794c71575ffdeb55301 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Fri, 12 Nov 2021 15:42:10 +0000 Subject: [PATCH 016/123] Improved loading of blend layouts in Blender to behave like to JSON one --- openpype/hosts/blender/api/plugin.py | 7 +++-- .../blender/plugins/load/load_layout_blend.py | 31 ++++++++++++++++--- .../publish/extract_blend_animation.py | 13 ++++---- .../plugins/publish/extract_fbx_animation.py | 2 +- .../unreal/plugins/load/load_animation.py | 29 ++++++++++++----- .../hosts/unreal/plugins/load/load_layout.py | 2 +- 6 files changed, 62 insertions(+), 22 deletions(-) diff --git a/openpype/hosts/blender/api/plugin.py b/openpype/hosts/blender/api/plugin.py index 6d437059b8..9056bd0686 100644 --- a/openpype/hosts/blender/api/plugin.py +++ b/openpype/hosts/blender/api/plugin.py @@ -42,10 +42,13 @@ def get_unique_number( return f"{count:0>2}" -def prepare_data(data, container_name): +def prepare_data(data, container_name=None): name = data.name local_data = data.make_local() - local_data.name = f"{container_name}:{name}" + if container_name: + local_data.name = f"{container_name}:{name}" + else: + local_data.name = f"{name}" return local_data diff --git a/openpype/hosts/blender/plugins/load/load_layout_blend.py b/openpype/hosts/blender/plugins/load/load_layout_blend.py index 4c1f751a77..84457fbd7c 100644 --- a/openpype/hosts/blender/plugins/load/load_layout_blend.py +++ b/openpype/hosts/blender/plugins/load/load_layout_blend.py @@ -10,6 +10,7 @@ from avalon import api from avalon.blender.pipeline import AVALON_CONTAINERS from avalon.blender.pipeline import AVALON_CONTAINER_ID from avalon.blender.pipeline import AVALON_PROPERTY +from openpype import lib from openpype.hosts.blender.api import plugin @@ -59,7 +60,9 @@ class BlendLayoutLoader(plugin.AssetLoader): library = bpy.data.libraries.get(bpy.path.basename(libpath)) bpy.data.libraries.remove(library) - def _process(self, libpath, asset_group, group_name, actions): + def _process( + self, libpath, asset_group, group_name, asset, representation, actions + ): with bpy.data.libraries.load( libpath, link=True, relative=False ) as (data_from, data_to): @@ -106,7 +109,7 @@ class BlendLayoutLoader(plugin.AssetLoader): parent.objects.link(obj) for obj in objects: - local_obj = plugin.prepare_data(obj, group_name) + local_obj = plugin.prepare_data(obj) action = None @@ -125,11 +128,12 @@ class BlendLayoutLoader(plugin.AssetLoader): if material_slot.material: plugin.prepare_data(material_slot.material, group_name) elif local_obj.type == 'ARMATURE': - plugin.prepare_data(local_obj.data, group_name) + plugin.prepare_data(local_obj.data) if action is not None: local_obj.animation_data.action = action - elif local_obj.animation_data.action is not None: + elif (local_obj.animation_data and + local_obj.animation_data.action is not None): plugin.prepare_data( local_obj.animation_data.action, group_name) @@ -140,6 +144,21 @@ class BlendLayoutLoader(plugin.AssetLoader): for t in v.targets: t.id = local_obj + elif local_obj.type == 'EMPTY': + creator_plugin = lib.get_creator_by_name("CreateAnimation") + if not creator_plugin: + raise ValueError("Creator plugin \"CreateAnimation\" was " + "not found.") + + api.create( + creator_plugin, + name=local_obj.name.split(':')[-1] + "_animation", + asset=asset, + options={"useSelection": False, + "asset_group": local_obj}, + data={"dependencies": representation} + ) + if not local_obj.get(AVALON_PROPERTY): local_obj[AVALON_PROPERTY] = dict() @@ -168,6 +187,7 @@ class BlendLayoutLoader(plugin.AssetLoader): libpath = self.fname asset = context["asset"]["name"] subset = context["subset"]["name"] + representation = str(context["representation"]["_id"]) asset_name = plugin.asset_name(asset, subset) unique_number = plugin.get_unique_number(asset, subset) @@ -183,7 +203,8 @@ class BlendLayoutLoader(plugin.AssetLoader): asset_group.empty_display_type = 'SINGLE_ARROW' avalon_container.objects.link(asset_group) - objects = self._process(libpath, asset_group, group_name, None) + objects = self._process( + libpath, asset_group, group_name, asset, representation, None) for child in asset_group.children: if child.get(AVALON_PROPERTY): diff --git a/openpype/hosts/blender/plugins/publish/extract_blend_animation.py b/openpype/hosts/blender/plugins/publish/extract_blend_animation.py index 239ca53f98..4917223331 100644 --- a/openpype/hosts/blender/plugins/publish/extract_blend_animation.py +++ b/openpype/hosts/blender/plugins/publish/extract_blend_animation.py @@ -29,12 +29,13 @@ class ExtractBlendAnimation(openpype.api.Extractor): if isinstance(obj, bpy.types.Object) and obj.type == 'EMPTY': child = obj.children[0] if child and child.type == 'ARMATURE': - if not obj.animation_data: - obj.animation_data_create() - obj.animation_data.action = child.animation_data.action - obj.animation_data_clear() - data_blocks.add(child.animation_data.action) - data_blocks.add(obj) + if child.animation_data and child.animation_data.action: + if not obj.animation_data: + obj.animation_data_create() + obj.animation_data.action = child.animation_data.action + obj.animation_data_clear() + data_blocks.add(child.animation_data.action) + data_blocks.add(obj) bpy.data.libraries.write(filepath, data_blocks) diff --git a/openpype/hosts/blender/plugins/publish/extract_fbx_animation.py b/openpype/hosts/blender/plugins/publish/extract_fbx_animation.py index 96fa37c07e..00346a39f2 100644 --- a/openpype/hosts/blender/plugins/publish/extract_fbx_animation.py +++ b/openpype/hosts/blender/plugins/publish/extract_fbx_animation.py @@ -123,7 +123,7 @@ class ExtractAnimationFBX(api.Extractor): json_path = os.path.join(stagingdir, json_filename) json_dict = { - "instance_name": asset_group.get(AVALON_PROPERTY).get("namespace") + "instance_name": asset_group.get(AVALON_PROPERTY).get("objectName") } # collection = instance.data.get("name") diff --git a/openpype/hosts/unreal/plugins/load/load_animation.py b/openpype/hosts/unreal/plugins/load/load_animation.py index f6037bee0a..20baa30847 100644 --- a/openpype/hosts/unreal/plugins/load/load_animation.py +++ b/openpype/hosts/unreal/plugins/load/load_animation.py @@ -183,20 +183,35 @@ class AnimationFBXLoader(api.Loader): task.set_editor_property('destination_name', name) task.set_editor_property('replace_existing', True) task.set_editor_property('automated', True) - task.set_editor_property('save', False) + task.set_editor_property('save', True) # set import options here task.options.set_editor_property( - 'automated_import_should_detect_type', True) + 'automated_import_should_detect_type', False) task.options.set_editor_property( - 'original_import_type', unreal.FBXImportType.FBXIT_ANIMATION) + 'original_import_type', unreal.FBXImportType.FBXIT_SKELETAL_MESH) + task.options.set_editor_property( + 'mesh_type_to_import', unreal.FBXImportType.FBXIT_ANIMATION) task.options.set_editor_property('import_mesh', False) task.options.set_editor_property('import_animations', True) + task.options.set_editor_property('override_full_name', True) - task.options.skeletal_mesh_import_data.set_editor_property( - 'import_content_type', - unreal.FBXImportContentType.FBXICT_SKINNING_WEIGHTS + task.options.anim_sequence_import_data.set_editor_property( + 'animation_length', + unreal.FBXAnimationLengthImportType.FBXALIT_EXPORTED_TIME ) + task.options.anim_sequence_import_data.set_editor_property( + 'import_meshes_in_bone_hierarchy', False) + task.options.anim_sequence_import_data.set_editor_property( + 'use_default_sample_rate', True) + task.options.anim_sequence_import_data.set_editor_property( + 'import_custom_attribute', True) + task.options.anim_sequence_import_data.set_editor_property( + 'import_bone_tracks', True) + task.options.anim_sequence_import_data.set_editor_property( + 'remove_redundant_keys', True) + task.options.anim_sequence_import_data.set_editor_property( + 'convert_scene', True) skeletal_mesh = unreal.EditorAssetLibrary.load_asset( container.get('namespace') + "/" + container.get('asset_name')) @@ -229,7 +244,7 @@ class AnimationFBXLoader(api.Loader): unreal.EditorAssetLibrary.delete_directory(path) asset_content = unreal.EditorAssetLibrary.list_assets( - parent_path, recursive=False + parent_path, recursive=False, include_folder=True ) if len(asset_content) == 0: diff --git a/openpype/hosts/unreal/plugins/load/load_layout.py b/openpype/hosts/unreal/plugins/load/load_layout.py index c32c810c36..ce15e49ad8 100644 --- a/openpype/hosts/unreal/plugins/load/load_layout.py +++ b/openpype/hosts/unreal/plugins/load/load_layout.py @@ -504,7 +504,7 @@ class LayoutLoader(api.Loader): EditorAssetLibrary.delete_directory(path) asset_content = EditorAssetLibrary.list_assets( - parent_path, recursive=False + parent_path, recursive=False, include_folder=True ) if len(asset_content) == 0: From 6aed38324bfbee479e86bbdb8ec447aacbb180b2 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Thu, 18 Nov 2021 11:53:56 +0000 Subject: [PATCH 017/123] Fix loading layout with rigs with animation --- .../blender/plugins/load/load_layout_blend.py | 77 +++++++++++++++++-- 1 file changed, 69 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/blender/plugins/load/load_layout_blend.py b/openpype/hosts/blender/plugins/load/load_layout_blend.py index 84457fbd7c..102541e9b6 100644 --- a/openpype/hosts/blender/plugins/load/load_layout_blend.py +++ b/openpype/hosts/blender/plugins/load/load_layout_blend.py @@ -86,12 +86,16 @@ class BlendLayoutLoader(plugin.AssetLoader): objects = [] nodes = list(container.children) - for obj in nodes: - obj.parent = asset_group + allowed_types = ['ARMATURE', 'MESH', 'EMPTY'] for obj in nodes: - objects.append(obj) - nodes.extend(list(obj.children)) + if obj.type in allowed_types: + obj.parent = asset_group + + for obj in nodes: + if obj.type in allowed_types: + objects.append(obj) + nodes.extend(list(obj.children)) objects.reverse() @@ -117,7 +121,7 @@ class BlendLayoutLoader(plugin.AssetLoader): action = actions.get(local_obj.name, None) if local_obj.type == 'MESH': - plugin.prepare_data(local_obj.data, group_name) + plugin.prepare_data(local_obj.data) if obj != local_obj: for constraint in constraints: @@ -126,16 +130,18 @@ class BlendLayoutLoader(plugin.AssetLoader): for material_slot in local_obj.material_slots: if material_slot.material: - plugin.prepare_data(material_slot.material, group_name) + plugin.prepare_data(material_slot.material) elif local_obj.type == 'ARMATURE': plugin.prepare_data(local_obj.data) if action is not None: + if local_obj.animation_data is None: + local_obj.animation_data_create() local_obj.animation_data.action = action elif (local_obj.animation_data and local_obj.animation_data.action is not None): plugin.prepare_data( - local_obj.animation_data.action, group_name) + local_obj.animation_data.action) # Set link the drivers to the local object if local_obj.data.animation_data: @@ -167,7 +173,62 @@ class BlendLayoutLoader(plugin.AssetLoader): objects.reverse() - bpy.data.orphans_purge(do_local_ids=False) + armatures = [ + obj for obj in bpy.data.objects + if obj.type == 'ARMATURE' and obj.library is None] + arm_act = {} + + # The armatures with an animation need to be at the center of the + # scene to be hooked correctly by the curves modifiers. + for armature in armatures: + if armature.animation_data and armature.animation_data.action: + arm_act[armature] = armature.animation_data.action + armature.animation_data.action = None + armature.location = (0.0, 0.0, 0.0) + for bone in armature.pose.bones: + bone.location = (0.0, 0.0, 0.0) + bone.rotation_euler = (0.0, 0.0, 0.0) + + curves = [obj for obj in data_to.objects if obj.type == 'CURVE'] + + for curve in curves: + rig_name = curve.name.split(':')[0] + rig_obj = bpy.data.objects.get(rig_name) + + local_obj = plugin.prepare_data(curve) + plugin.prepare_data(local_obj.data) + + # Curves need to reset the hook, but to do that they need to be + # in the view layer. + parent.objects.link(local_obj) + plugin.deselect_all() + local_obj.select_set(True) + bpy.context.view_layer.objects.active = local_obj + bpy.ops.object.mode_set(mode='EDIT') + bpy.ops.object.hook_reset() + bpy.ops.object.mode_set(mode='OBJECT') + parent.objects.unlink(local_obj) + + local_obj.use_fake_user = True + + for mod in local_obj.modifiers: + mod.object = bpy.data.objects.get(f"{mod.object.name}") + + if not local_obj.get(AVALON_PROPERTY): + local_obj[AVALON_PROPERTY] = dict() + + avalon_info = local_obj[AVALON_PROPERTY] + avalon_info.update({"container_name": group_name}) + + local_obj.parent = rig_obj + objects.append(local_obj) + + for armature in armatures: + if arm_act.get(armature): + armature.animation_data.action = arm_act[armature] + + while bpy.data.orphans_purge(do_local_ids=False): + pass plugin.deselect_all() From dd7d08590658ebf1f44cd9a55bd292830665ca2f Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Tue, 30 Nov 2021 15:20:25 +0000 Subject: [PATCH 018/123] Fix problem with the loaded container --- .../blender/plugins/load/load_layout_blend.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/blender/plugins/load/load_layout_blend.py b/openpype/hosts/blender/plugins/load/load_layout_blend.py index 102541e9b6..b7981e0fc8 100644 --- a/openpype/hosts/blender/plugins/load/load_layout_blend.py +++ b/openpype/hosts/blender/plugins/load/load_layout_blend.py @@ -75,7 +75,8 @@ class BlendLayoutLoader(plugin.AssetLoader): container = None for empty in empties: - if empty.get(AVALON_PROPERTY): + if (empty.get(AVALON_PROPERTY) and + empty.get(AVALON_PROPERTY).get('family') == 'layout'): container = empty break @@ -174,7 +175,7 @@ class BlendLayoutLoader(plugin.AssetLoader): objects.reverse() armatures = [ - obj for obj in bpy.data.objects + obj for obj in bpy.data.objects if obj.type == 'ARMATURE' and obj.library is None] arm_act = {} @@ -192,8 +193,8 @@ class BlendLayoutLoader(plugin.AssetLoader): curves = [obj for obj in data_to.objects if obj.type == 'CURVE'] for curve in curves: - rig_name = curve.name.split(':')[0] - rig_obj = bpy.data.objects.get(rig_name) + curve_name = curve.name.split(':')[0] + curve_obj = bpy.data.objects.get(curve_name) local_obj = plugin.prepare_data(curve) plugin.prepare_data(local_obj.data) @@ -204,9 +205,10 @@ class BlendLayoutLoader(plugin.AssetLoader): plugin.deselect_all() local_obj.select_set(True) bpy.context.view_layer.objects.active = local_obj - bpy.ops.object.mode_set(mode='EDIT') - bpy.ops.object.hook_reset() - bpy.ops.object.mode_set(mode='OBJECT') + if local_obj.library == None: + bpy.ops.object.mode_set(mode='EDIT') + bpy.ops.object.hook_reset() + bpy.ops.object.mode_set(mode='OBJECT') parent.objects.unlink(local_obj) local_obj.use_fake_user = True @@ -220,7 +222,7 @@ class BlendLayoutLoader(plugin.AssetLoader): avalon_info = local_obj[AVALON_PROPERTY] avalon_info.update({"container_name": group_name}) - local_obj.parent = rig_obj + local_obj.parent = curve_obj objects.append(local_obj) for armature in armatures: From 535aa5b29be4112ce94f7f25a2ecf19486b35266 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Wed, 8 Dec 2021 19:04:02 +0100 Subject: [PATCH 019/123] handle invalid file type --- openpype/tools/mayalookassigner/vray_proxies.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openpype/tools/mayalookassigner/vray_proxies.py b/openpype/tools/mayalookassigner/vray_proxies.py index d2f345e628..9252f22d8f 100644 --- a/openpype/tools/mayalookassigner/vray_proxies.py +++ b/openpype/tools/mayalookassigner/vray_proxies.py @@ -41,7 +41,12 @@ def get_alembic_paths_by_property(filename, attr, verbose=False): filename = filename.replace("\\", "/") filename = str(filename) # path must be string - archive = alembic.Abc.IArchive(filename) + try: + archive = alembic.Abc.IArchive(filename) + except RuntimeError: + # invalid alembic file - probably vrmesh + log.warning("{} is not an alembic file".format(filename)) + return {} root = archive.getTop() iterator = list(root.children) From 1812a05dde7fa0c37aaa4bc25dde1197040d5a86 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Mon, 13 Dec 2021 10:11:27 +0100 Subject: [PATCH 020/123] fix get all assets --- openpype/tools/mayalookassigner/commands.py | 5 ++--- openpype/tools/mayalookassigner/widgets.py | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/openpype/tools/mayalookassigner/commands.py b/openpype/tools/mayalookassigner/commands.py index f7d26f9adb..9449d042f1 100644 --- a/openpype/tools/mayalookassigner/commands.py +++ b/openpype/tools/mayalookassigner/commands.py @@ -106,7 +106,7 @@ def create_asset_id_hash(nodes): # iterate over content of reference node if cmds.nodeType(node) == "reference": ref_hashes = create_asset_id_hash( - cmds.referenceQuery(node, nodes=True)) + cmds.referenceQuery(node, nodes=True, dp=True)) for asset_id, ref_nodes in ref_hashes.items(): node_id_hash[asset_id] += ref_nodes else: @@ -151,8 +151,7 @@ def create_items_from_nodes(nodes): for k, _ in ids.items(): pid = k.split(":")[0] if not parent_id.get(pid): - parent_id.update({pid: [vp]}) - + parent_id[pid] = [vp] print("Adding ids from alembic {}".format(path)) id_hashes.update(parent_id) diff --git a/openpype/tools/mayalookassigner/widgets.py b/openpype/tools/mayalookassigner/widgets.py index 625e9ef8c6..bc19913b8b 100644 --- a/openpype/tools/mayalookassigner/widgets.py +++ b/openpype/tools/mayalookassigner/widgets.py @@ -90,8 +90,8 @@ class AssetOutliner(QtWidgets.QWidget): return items def get_all_assets(self): - """Add all items from the current scene""" - + """Add all items from the current scene.""" + items = [] with lib.preserve_expanded_rows(self.view): with lib.preserve_selection(self.view): self.clear() @@ -237,7 +237,7 @@ class LookOutliner(QtWidgets.QWidget): """ datas = [i.data(TreeModel.ItemRole) for i in self.view.get_indices()] - items = [d for d in datas if d is not None] # filter Nones + items = [d for d in datas if d is not None] # filter Nones return items From 5d06c85a34826c040ecc62c47622719444e053f0 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Fri, 17 Dec 2021 18:38:56 +0100 Subject: [PATCH 021/123] fixing vray look assigning --- openpype/tools/mayalookassigner/app.py | 12 ++++---- openpype/tools/mayalookassigner/commands.py | 30 +++++++++++++++---- .../tools/mayalookassigner/vray_proxies.py | 10 ++++--- openpype/tools/mayalookassigner/widgets.py | 15 ++++------ 4 files changed, 42 insertions(+), 25 deletions(-) diff --git a/openpype/tools/mayalookassigner/app.py b/openpype/tools/mayalookassigner/app.py index fb99333f87..31bb455f95 100644 --- a/openpype/tools/mayalookassigner/app.py +++ b/openpype/tools/mayalookassigner/app.py @@ -24,7 +24,6 @@ from .commands import ( ) from .vray_proxies import vrayproxy_assign_look - module = sys.modules[__name__] module.window = None @@ -210,7 +209,7 @@ class App(QtWidgets.QWidget): # Assign the first matching look relevant for this asset # (since assigning multiple to the same nodes makes no sense) assign_look = next((subset for subset in item["looks"] - if subset["name"] in looks), None) + if subset["name"] in looks), None) if not assign_look: self.echo("{} No matching selected " "look for {}".format(prefix, asset)) @@ -229,11 +228,14 @@ class App(QtWidgets.QWidget): if cmds.pluginInfo('vrayformaya', query=True, loaded=True): self.echo("Getting vray proxy nodes ...") - vray_proxies = set(cmds.ls(type="VRayProxy")) - nodes = list(set(item["nodes"]).difference(vray_proxies)) + vray_proxies = set(cmds.ls(type="VRayProxy", long=True)) + if vray_proxies: for vp in vray_proxies: - vrayproxy_assign_look(vp, subset_name) + if vp in nodes: + vrayproxy_assign_look(vp, subset_name) + + nodes = list(set(item["nodes"]).difference(vray_proxies)) # Assign look if nodes: diff --git a/openpype/tools/mayalookassigner/commands.py b/openpype/tools/mayalookassigner/commands.py index f7d26f9adb..740e4fa6fe 100644 --- a/openpype/tools/mayalookassigner/commands.py +++ b/openpype/tools/mayalookassigner/commands.py @@ -8,7 +8,6 @@ from openpype.hosts.maya.api import lib from avalon import io, api - from .vray_proxies import get_alembic_ids_cache log = logging.getLogger(__name__) @@ -68,7 +67,9 @@ def get_selected_nodes(): selection = cmds.ls(selection=True, long=True) hierarchy = list_descendents(selection) - return list(set(selection + hierarchy)) + selected_nodes = list(set(selection + hierarchy)) + log.warning("selected nodes: {}".format(selected_nodes)) + return selected_nodes def get_all_asset_nodes(): @@ -79,17 +80,23 @@ def get_all_asset_nodes(): """ host = api.registered_host() + containers = host.ls() nodes = [] + log.debug("got {}".format(containers)) for container in host.ls(): # We are not interested in looks but assets! if container["loader"] == "LookLoader": + log.warning("skipping {}".format(container)) continue # Gather all information container_name = container["objectName"] + log.warning("--- listing: {}".format(container_name)) nodes += cmds.sets(container_name, query=True, nodesOnly=True) or [] + nodes = list(set(nodes)) + log.warning("returning {}".format(nodes)) return nodes @@ -102,13 +109,24 @@ def create_asset_id_hash(nodes): dict """ node_id_hash = defaultdict(list) + + # log.warning(pformat(nodes)) for node in nodes: # iterate over content of reference node if cmds.nodeType(node) == "reference": ref_hashes = create_asset_id_hash( - cmds.referenceQuery(node, nodes=True)) + list(set(cmds.referenceQuery(node, nodes=True, dp=True)))) for asset_id, ref_nodes in ref_hashes.items(): node_id_hash[asset_id] += ref_nodes + elif cmds.pluginInfo('vrayformaya', query=True, + loaded=True) and cmds.nodeType( + node) == "VRayProxy": + path = cmds.getAttr("{}.fileName".format(node)) + ids = get_alembic_ids_cache(path) + for k, _ in ids.items(): + pid = k.split(":")[0] + if not node_id_hash.get(pid): + node_id_hash[pid] = [node] else: value = lib.get_id(node) if value is None: @@ -151,12 +169,12 @@ def create_items_from_nodes(nodes): for k, _ in ids.items(): pid = k.split(":")[0] if not parent_id.get(pid): - parent_id.update({pid: [vp]}) - - print("Adding ids from alembic {}".format(path)) + parent_id[pid] = [vp] + log.warning("Adding ids from alembic {}".format(path)) id_hashes.update(parent_id) if not id_hashes: + log.warning("No id hashes") return asset_view_items for _id, id_nodes in id_hashes.items(): diff --git a/openpype/tools/mayalookassigner/vray_proxies.py b/openpype/tools/mayalookassigner/vray_proxies.py index d2f345e628..fe36894466 100644 --- a/openpype/tools/mayalookassigner/vray_proxies.py +++ b/openpype/tools/mayalookassigner/vray_proxies.py @@ -41,7 +41,11 @@ def get_alembic_paths_by_property(filename, attr, verbose=False): filename = filename.replace("\\", "/") filename = str(filename) # path must be string - archive = alembic.Abc.IArchive(filename) + try: + archive = alembic.Abc.IArchive(filename) + except RuntimeError: + # invalid file format + return {} root = archive.getTop() iterator = list(root.children) @@ -201,9 +205,7 @@ def load_look(version_id): with avalon.maya.maintained_selection(): container_node = api.load(loader, look_representation) - # Get container members - shader_nodes = cmds.sets(container_node, query=True) - return shader_nodes + return cmds.sets(container_node, query=True) def get_latest_version(asset_id, subset): diff --git a/openpype/tools/mayalookassigner/widgets.py b/openpype/tools/mayalookassigner/widgets.py index 625e9ef8c6..fceaf27244 100644 --- a/openpype/tools/mayalookassigner/widgets.py +++ b/openpype/tools/mayalookassigner/widgets.py @@ -20,7 +20,6 @@ MODELINDEX = QtCore.QModelIndex() class AssetOutliner(QtWidgets.QWidget): - refreshed = QtCore.Signal() selection_changed = QtCore.Signal() @@ -84,14 +83,13 @@ class AssetOutliner(QtWidgets.QWidget): """ selection_model = self.view.selectionModel() - items = [row.data(TreeModel.ItemRole) for row in - selection_model.selectedRows(0)] - - return items + return [row.data(TreeModel.ItemRole) + for row in selection_model.selectedRows(0)] def get_all_assets(self): """Add all items from the current scene""" + items = [] with lib.preserve_expanded_rows(self.view): with lib.preserve_selection(self.view): self.clear() @@ -118,7 +116,7 @@ class AssetOutliner(QtWidgets.QWidget): # Collect all nodes by hash (optimization) if not selection: - nodes = cmds.ls(dag=True, long=True) + nodes = cmds.ls(dag=True, long=True) else: nodes = commands.get_selected_nodes() id_nodes = commands.create_asset_id_hash(nodes) @@ -187,7 +185,6 @@ class AssetOutliner(QtWidgets.QWidget): class LookOutliner(QtWidgets.QWidget): - menu_apply_action = QtCore.Signal() def __init__(self, parent=None): @@ -237,9 +234,7 @@ class LookOutliner(QtWidgets.QWidget): """ datas = [i.data(TreeModel.ItemRole) for i in self.view.get_indices()] - items = [d for d in datas if d is not None] # filter Nones - - return items + return [d for d in datas if d is not None] def right_mouse_menu(self, pos): """Build RMB menu for look view""" From f820602caae96c61a8ab4fdeb9767982fe5765a9 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Fri, 17 Dec 2021 18:43:51 +0100 Subject: [PATCH 022/123] remove debug prints --- openpype/tools/mayalookassigner/commands.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/openpype/tools/mayalookassigner/commands.py b/openpype/tools/mayalookassigner/commands.py index 740e4fa6fe..9f6f244a35 100644 --- a/openpype/tools/mayalookassigner/commands.py +++ b/openpype/tools/mayalookassigner/commands.py @@ -67,9 +67,7 @@ def get_selected_nodes(): selection = cmds.ls(selection=True, long=True) hierarchy = list_descendents(selection) - selected_nodes = list(set(selection + hierarchy)) - log.warning("selected nodes: {}".format(selected_nodes)) - return selected_nodes + return list(set(selection + hierarchy)) def get_all_asset_nodes(): @@ -83,20 +81,16 @@ def get_all_asset_nodes(): containers = host.ls() nodes = [] - log.debug("got {}".format(containers)) for container in host.ls(): # We are not interested in looks but assets! if container["loader"] == "LookLoader": - log.warning("skipping {}".format(container)) continue # Gather all information container_name = container["objectName"] - log.warning("--- listing: {}".format(container_name)) nodes += cmds.sets(container_name, query=True, nodesOnly=True) or [] nodes = list(set(nodes)) - log.warning("returning {}".format(nodes)) return nodes @@ -109,8 +103,6 @@ def create_asset_id_hash(nodes): dict """ node_id_hash = defaultdict(list) - - # log.warning(pformat(nodes)) for node in nodes: # iterate over content of reference node if cmds.nodeType(node) == "reference": From d53a40c4e5f72704cf90350081d57d5a767a3223 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 5 Jan 2022 00:44:20 +0100 Subject: [PATCH 023/123] Validate Rig produces no cycle errors --- .../publish/validate_rig_cycle_error.py | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 openpype/hosts/maya/plugins/publish/validate_rig_cycle_error.py diff --git a/openpype/hosts/maya/plugins/publish/validate_rig_cycle_error.py b/openpype/hosts/maya/plugins/publish/validate_rig_cycle_error.py new file mode 100644 index 0000000000..d5d2863054 --- /dev/null +++ b/openpype/hosts/maya/plugins/publish/validate_rig_cycle_error.py @@ -0,0 +1,36 @@ +from maya import cmds + +import pyblish.api + +from avalon import maya + +import openpype.api +import openpype.hosts.maya.api.action +from openpype.hosts.maya.api.lib import undo_chunk + + +class ValidateRigCycleError(pyblish.api.InstancePlugin): + """Validate rig nodes produce have no cycle errors.""" + + order = openpype.api.ValidateContentsOrder + 0.05 + label = "Rig Cycle Errors" + hosts = ["maya"] + families = ["rig"] + actions = [openpype.hosts.maya.api.action.SelectInvalidAction] + optional = True + + def process(self, instance): + invalid = self.get_invalid(instance) + if invalid: + raise RuntimeError("Rig nodes produce a cycle error: %s" % invalid) + + @classmethod + def get_invalid(cls, instance): + + with maya.maintained_selection(): + cmds.select(instance[:], noExpand=True) + plugs = cmds.cycleCheck(all=False, # check selection only + list=True) + invalid = cmds.ls(plugs, objectsOnly=True, long=True) + return invalid + From 477d896fd98bce10f36ed66104766b75bf37f2a8 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 5 Jan 2022 02:28:14 +0100 Subject: [PATCH 024/123] Shush the hound: remove unused import + cosmetics --- openpype/hosts/maya/plugins/publish/validate_rig_cycle_error.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/validate_rig_cycle_error.py b/openpype/hosts/maya/plugins/publish/validate_rig_cycle_error.py index d5d2863054..03ae47d645 100644 --- a/openpype/hosts/maya/plugins/publish/validate_rig_cycle_error.py +++ b/openpype/hosts/maya/plugins/publish/validate_rig_cycle_error.py @@ -6,7 +6,6 @@ from avalon import maya import openpype.api import openpype.hosts.maya.api.action -from openpype.hosts.maya.api.lib import undo_chunk class ValidateRigCycleError(pyblish.api.InstancePlugin): @@ -33,4 +32,3 @@ class ValidateRigCycleError(pyblish.api.InstancePlugin): list=True) invalid = cmds.ls(plugs, objectsOnly=True, long=True) return invalid - From 6199f6e6654ee0f672935f767e5bde22dbf2c25f Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 5 Jan 2022 10:36:36 +0100 Subject: [PATCH 025/123] Collect 'fps' animation data only for "review" instances --- openpype/hosts/maya/api/lib.py | 7 ++++--- openpype/hosts/maya/plugins/create/create_review.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 52ebcaff64..d1054988d1 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -280,7 +280,7 @@ def shape_from_element(element): return node -def collect_animation_data(): +def collect_animation_data(fps=False): """Get the basic animation data Returns: @@ -291,7 +291,6 @@ def collect_animation_data(): # get scene values as defaults start = cmds.playbackOptions(query=True, animationStartTime=True) end = cmds.playbackOptions(query=True, animationEndTime=True) - fps = mel.eval('currentTimeUnitToFPS()') # build attributes data = OrderedDict() @@ -299,7 +298,9 @@ def collect_animation_data(): data["frameEnd"] = end data["handles"] = 0 data["step"] = 1.0 - data["fps"] = fps + + if fps: + data["fps"] = mel.eval('currentTimeUnitToFPS()') return data diff --git a/openpype/hosts/maya/plugins/create/create_review.py b/openpype/hosts/maya/plugins/create/create_review.py index 05b05be7a5..ae636ec691 100644 --- a/openpype/hosts/maya/plugins/create/create_review.py +++ b/openpype/hosts/maya/plugins/create/create_review.py @@ -22,7 +22,7 @@ class CreateReview(plugin.Creator): # get basic animation data : start / end / handles / steps data = OrderedDict(**self.data) - animation_data = lib.collect_animation_data() + animation_data = lib.collect_animation_data(fps=True) for key, value in animation_data.items(): data[key] = value From f66f67971078cb137484796d13692ff1ec064592 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 7 Jan 2022 18:22:23 +0100 Subject: [PATCH 026/123] renamed 'root' to '_workfiles_root' --- openpype/tools/workfiles/app.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py index f4a86050cb..e05a51a962 100644 --- a/openpype/tools/workfiles/app.py +++ b/openpype/tools/workfiles/app.py @@ -367,7 +367,7 @@ class FilesWidget(QtWidgets.QWidget): self.template_key = "work" # This is not root but workfile directory - self.root = None + self._workfiles_root = None self.host = api.registered_host() # Whether to automatically select the latest modified @@ -465,8 +465,8 @@ class FilesWidget(QtWidgets.QWidget): # This way we can browse it even before we enter it. if self._asset_id and self._task_name and self._task_type: session = self._get_session() - self.root = self.host.work_root(session) - self.files_model.set_root(self.root) + self._workfiles_root = self.host.work_root(session) + self.files_model.set_root(self._workfiles_root) else: self.files_model.set_root(None) @@ -590,7 +590,7 @@ class FilesWidget(QtWidgets.QWidget): window = NameWindow( parent=self, - root=self.root, + root=self._workfiles_root, anatomy=self.anatomy, template_key=self.template_key, session=session @@ -605,7 +605,7 @@ class FilesWidget(QtWidgets.QWidget): return src = self._get_selected_filepath() - dst = os.path.join(self.root, work_file) + dst = os.path.join(self._workfiles_root, work_file) shutil.copy(src, dst) self.workfile_created.emit(dst) @@ -638,9 +638,9 @@ class FilesWidget(QtWidgets.QWidget): "filter": ext_filter } if Qt.__binding__ in ("PySide", "PySide2"): - kwargs["dir"] = self.root + kwargs["dir"] = self._workfiles_root else: - kwargs["directory"] = self.root + kwargs["directory"] = self._workfiles_root work_file = QtWidgets.QFileDialog.getOpenFileName(**kwargs)[0] if work_file: @@ -652,17 +652,21 @@ class FilesWidget(QtWidgets.QWidget): return # Initialize work directory if it has not been initialized before - if not os.path.exists(self.root): - log.debug("Initializing Work Directory: %s", self.root) + if not os.path.exists(self._workfiles_root): + log.debug("Initializing Work Directory: %s", self._workfiles_root) self.initialize_work_directory() - if not os.path.exists(self.root): + if not os.path.exists(self._workfiles_root): # Failed to initialize Work Directory log.error( - "Failed to initialize Work Directory: {}".format(self.root) + "Failed to initialize Work Directory: {}".format( + self._workfiles_root + ) ) return - file_path = os.path.join(os.path.normpath(self.root), work_file) + file_path = os.path.join( + os.path.normpath(self._workfiles_root), work_file + ) pipeline.emit("before.workfile.save", [file_path]) @@ -673,7 +677,7 @@ class FilesWidget(QtWidgets.QWidget): self._asset_id, self._task_name, self._task_type ) create_workdir_extra_folders( - self.root, + self._workfiles_root, api.Session["AVALON_APP"], self._task_type, self._task_name, From 82432e476434ac36724dee72bd830cfcd678c7c5 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 7 Jan 2022 18:22:40 +0100 Subject: [PATCH 027/123] added variable '_workdir_path' which is used to create extra folders --- openpype/tools/workfiles/app.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py index e05a51a962..04dc1ed40b 100644 --- a/openpype/tools/workfiles/app.py +++ b/openpype/tools/workfiles/app.py @@ -368,6 +368,7 @@ class FilesWidget(QtWidgets.QWidget): # This is not root but workfile directory self._workfiles_root = None + self._workdir_path = None self.host = api.registered_host() # Whether to automatically select the latest modified @@ -465,6 +466,7 @@ class FilesWidget(QtWidgets.QWidget): # This way we can browse it even before we enter it. if self._asset_id and self._task_name and self._task_type: session = self._get_session() + self._workdir_path = session["AVALON_WORKDIR"] self._workfiles_root = self.host.work_root(session) self.files_model.set_root(self._workfiles_root) @@ -677,6 +679,7 @@ class FilesWidget(QtWidgets.QWidget): self._asset_id, self._task_name, self._task_type ) create_workdir_extra_folders( + self._workdir_path, self._workfiles_root, api.Session["AVALON_APP"], self._task_type, From 7075183a47e0f6848d98db9b804a92f94bfec6e5 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 7 Jan 2022 18:26:12 +0100 Subject: [PATCH 028/123] emit also workdir for 'before.workfile.save' --- openpype/hosts/maya/api/__init__.py | 9 +++------ openpype/tools/workfiles/app.py | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/maya/api/__init__.py b/openpype/hosts/maya/api/__init__.py index b25fd44217..17ec7ac56d 100644 --- a/openpype/hosts/maya/api/__init__.py +++ b/openpype/hosts/maya/api/__init__.py @@ -218,12 +218,9 @@ def on_task_changed(*args): ) -def before_workfile_save(workfile_path): - if not workfile_path: - return - - workdir = os.path.dirname(workfile_path) - copy_workspace_mel(workdir) +def before_workfile_save(workfile_path, workdir_path): + if workdir_path: + copy_workspace_mel(workdir_path) class MayaDirmap(HostDirmap): diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py index 04dc1ed40b..bd666d9d4f 100644 --- a/openpype/tools/workfiles/app.py +++ b/openpype/tools/workfiles/app.py @@ -670,7 +670,7 @@ class FilesWidget(QtWidgets.QWidget): os.path.normpath(self._workfiles_root), work_file ) - pipeline.emit("before.workfile.save", [file_path]) + pipeline.emit("before.workfile.save", [file_path, self._workdir_path]) self._enter_session() # Make sure we are in the right session self.host.save_file(file_path) From 7a1edd6b1eb50fe3c2c3fec50fa7f75689e7dda7 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 7 Jan 2022 18:39:14 +0100 Subject: [PATCH 029/123] added base of event objects --- openpype/pipeline/lib/__init__.py | 8 +++++++ openpype/pipeline/lib/events.py | 38 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 openpype/pipeline/lib/events.py diff --git a/openpype/pipeline/lib/__init__.py b/openpype/pipeline/lib/__init__.py index 1bb65be79b..e2c15cbd2d 100644 --- a/openpype/pipeline/lib/__init__.py +++ b/openpype/pipeline/lib/__init__.py @@ -1,3 +1,8 @@ +from .events import ( + BaseEvent, + BeforeWorkfileSave +) + from .attribute_definitions import ( AbtractAttrDef, UnknownDef, @@ -9,6 +14,9 @@ from .attribute_definitions import ( __all__ = ( + "BaseEvent", + "BeforeWorkfileSave", + "AbtractAttrDef", "UnknownDef", "NumberDef", diff --git a/openpype/pipeline/lib/events.py b/openpype/pipeline/lib/events.py new file mode 100644 index 0000000000..8e7dcbd70e --- /dev/null +++ b/openpype/pipeline/lib/events.py @@ -0,0 +1,38 @@ +"""Events holding data about specific event.""" + + +class BaseEvent: + """Base event object. + + Can be used to anything because data are not much specific. Only required + argument is topic which defines why event is happening and may be used for + filtering. + + Arg: + topic (str): Identifier of event. + data (Any): Data specific for event. Dictionary is recommended. + """ + _data = {} + + def __init__(self, topic, data=None): + self._topic = topic + if data is None: + data = {} + self._data = data + + @property + def data(self): + return self._data + + @property + def topic(self): + return self._topic + + +class BeforeWorkfileSave(BaseEvent): + """Before workfile changes event data.""" + def __init__(self, new_workfile, workdir): + super(BeforeWorkfileSave, self).__init__("before.workfile.save") + + self.workfile_path = new_workfile + self.workdir_path = workdir From 4aa096d5bc0d4d812abcabdf9cc2e154f0461ef5 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 7 Jan 2022 18:54:11 +0100 Subject: [PATCH 030/123] added emit function --- openpype/pipeline/lib/events.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/openpype/pipeline/lib/events.py b/openpype/pipeline/lib/events.py index 8e7dcbd70e..9a6bd12f2d 100644 --- a/openpype/pipeline/lib/events.py +++ b/openpype/pipeline/lib/events.py @@ -1,7 +1,8 @@ """Events holding data about specific event.""" -class BaseEvent: +# Inherit from 'object' for Python 2 hosts +class BaseEvent(object): """Base event object. Can be used to anything because data are not much specific. Only required @@ -28,6 +29,13 @@ class BaseEvent: def topic(self): return self._topic + @classmethod + def emit(cls, *args, **kwargs): + from avalon import pipeline + + obj = cls(*args, **kwargs) + pipeline.emit(obj.topic, [obj]) + class BeforeWorkfileSave(BaseEvent): """Before workfile changes event data.""" From 4e904288ad707b764676607f9aa1bbc2abdf077e Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 7 Jan 2022 18:55:30 +0100 Subject: [PATCH 031/123] emit BeforeWorkfileSave event in workfiles tool --- openpype/hosts/maya/api/__init__.py | 3 ++- openpype/pipeline/lib/events.py | 6 ++++++ openpype/tools/workfiles/app.py | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/maya/api/__init__.py b/openpype/hosts/maya/api/__init__.py index 17ec7ac56d..0ad1c8ba29 100644 --- a/openpype/hosts/maya/api/__init__.py +++ b/openpype/hosts/maya/api/__init__.py @@ -218,7 +218,8 @@ def on_task_changed(*args): ) -def before_workfile_save(workfile_path, workdir_path): +def before_workfile_save(event): + workdir_path = event.workdir_path if workdir_path: copy_workspace_mel(workdir_path) diff --git a/openpype/pipeline/lib/events.py b/openpype/pipeline/lib/events.py index 9a6bd12f2d..b9ad889383 100644 --- a/openpype/pipeline/lib/events.py +++ b/openpype/pipeline/lib/events.py @@ -31,10 +31,16 @@ class BaseEvent(object): @classmethod def emit(cls, *args, **kwargs): + """Create object of event and emit. + + Args: + Same args as '__init__' expects which may be class specific. + """ from avalon import pipeline obj = cls(*args, **kwargs) pipeline.emit(obj.topic, [obj]) + return obj class BeforeWorkfileSave(BaseEvent): diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py index bd666d9d4f..763e0f796d 100644 --- a/openpype/tools/workfiles/app.py +++ b/openpype/tools/workfiles/app.py @@ -11,6 +11,7 @@ from Qt import QtWidgets, QtCore from avalon import io, api, pipeline from openpype import style +from openpype.pipeline.lib import BeforeWorkfileSave from openpype.tools.utils.lib import ( qt_app_context ) @@ -670,7 +671,7 @@ class FilesWidget(QtWidgets.QWidget): os.path.normpath(self._workfiles_root), work_file ) - pipeline.emit("before.workfile.save", [file_path, self._workdir_path]) + BeforeWorkfileSave.emit(file_path, self._workdir_path) self._enter_session() # Make sure we are in the right session self.host.save_file(file_path) From c94ce278f15428c4b717471378cb7f29c320988f Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 7 Jan 2022 19:04:46 +0100 Subject: [PATCH 032/123] added data to event --- openpype/pipeline/lib/events.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openpype/pipeline/lib/events.py b/openpype/pipeline/lib/events.py index b9ad889383..d9920b38e3 100644 --- a/openpype/pipeline/lib/events.py +++ b/openpype/pipeline/lib/events.py @@ -46,7 +46,11 @@ class BaseEvent(object): class BeforeWorkfileSave(BaseEvent): """Before workfile changes event data.""" def __init__(self, new_workfile, workdir): - super(BeforeWorkfileSave, self).__init__("before.workfile.save") + data = { + "workfile_path": new_workfile, + "workdir_path": workdir + } + super(BeforeWorkfileSave, self).__init__("before.workfile.save", data) self.workfile_path = new_workfile self.workdir_path = workdir From 34830ee8813a6256131dea57eb6ac312b8d465b4 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 7 Jan 2022 21:22:02 +0100 Subject: [PATCH 033/123] removed line --- openpype/tools/workfiles/app.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py index 763e0f796d..703d077448 100644 --- a/openpype/tools/workfiles/app.py +++ b/openpype/tools/workfiles/app.py @@ -681,7 +681,6 @@ class FilesWidget(QtWidgets.QWidget): ) create_workdir_extra_folders( self._workdir_path, - self._workfiles_root, api.Session["AVALON_APP"], self._task_type, self._task_name, From 3d2a39b592ae11a96bbb1f293d632110629e034a Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 7 Jan 2022 22:45:42 +0100 Subject: [PATCH 034/123] trigger before save event as first thing --- openpype/pipeline/lib/events.py | 11 +++-------- openpype/tools/workfiles/app.py | 6 +++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/openpype/pipeline/lib/events.py b/openpype/pipeline/lib/events.py index d9920b38e3..05dea20e8c 100644 --- a/openpype/pipeline/lib/events.py +++ b/openpype/pipeline/lib/events.py @@ -45,12 +45,7 @@ class BaseEvent(object): class BeforeWorkfileSave(BaseEvent): """Before workfile changes event data.""" - def __init__(self, new_workfile, workdir): - data = { - "workfile_path": new_workfile, - "workdir_path": workdir - } - super(BeforeWorkfileSave, self).__init__("before.workfile.save", data) - - self.workfile_path = new_workfile + def __init__(self, filename, workdir): + super(BeforeWorkfileSave, self).__init__("before.workfile.save") + self.filename = filename self.workdir_path = workdir diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py index 703d077448..92cb23b619 100644 --- a/openpype/tools/workfiles/app.py +++ b/openpype/tools/workfiles/app.py @@ -654,6 +654,9 @@ class FilesWidget(QtWidgets.QWidget): if not work_file: return + # Trigger before save event + BeforeWorkfileSave.emit(work_file, self._workdir_path) + # Initialize work directory if it has not been initialized before if not os.path.exists(self._workfiles_root): log.debug("Initializing Work Directory: %s", self._workfiles_root) @@ -670,9 +673,6 @@ class FilesWidget(QtWidgets.QWidget): file_path = os.path.join( os.path.normpath(self._workfiles_root), work_file ) - - BeforeWorkfileSave.emit(file_path, self._workdir_path) - self._enter_session() # Make sure we are in the right session self.host.save_file(file_path) From d3eac428adf7d34fbee2cb73763c32a743c64246 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 7 Jan 2022 22:49:09 +0100 Subject: [PATCH 035/123] reorganized on save as method --- openpype/tools/workfiles/app.py | 91 +++++++++------------------------ 1 file changed, 24 insertions(+), 67 deletions(-) diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py index 92cb23b619..b73f0e4930 100644 --- a/openpype/tools/workfiles/app.py +++ b/openpype/tools/workfiles/app.py @@ -650,35 +650,33 @@ class FilesWidget(QtWidgets.QWidget): self.open_file(work_file) def on_save_as_pressed(self): - work_file = self.get_filename() - if not work_file: + work_filename = self.get_filename() + if not work_filename: return # Trigger before save event - BeforeWorkfileSave.emit(work_file, self._workdir_path) - - # Initialize work directory if it has not been initialized before - if not os.path.exists(self._workfiles_root): - log.debug("Initializing Work Directory: %s", self._workfiles_root) - self.initialize_work_directory() - if not os.path.exists(self._workfiles_root): - # Failed to initialize Work Directory - log.error( - "Failed to initialize Work Directory: {}".format( - self._workfiles_root - ) - ) - return - - file_path = os.path.join( - os.path.normpath(self._workfiles_root), work_file - ) - self._enter_session() # Make sure we are in the right session - self.host.save_file(file_path) + BeforeWorkfileSave.emit(work_filename, self._workdir_path) + # Make sure workfiles root is updated + # - this triggers 'workio.work_root(...)' which may change value of + # '_workfiles_root' self.set_asset_task( self._asset_id, self._task_name, self._task_type ) + + # Create workfiles root folder + if not os.path.exists(self._workfiles_root): + log.debug("Initializing Work Directory: %s", self._workfiles_root) + os.makedirs(self._workfiles_root) + + # Update session if context has changed + self._enter_session() + # Prepare full path to workfile and save it + filepath = os.path.join( + os.path.normpath(self._workfiles_root), work_filename + ) + self.host.save_file(filepath) + # Create extra folders create_workdir_extra_folders( self._workdir_path, api.Session["AVALON_APP"], @@ -686,57 +684,16 @@ class FilesWidget(QtWidgets.QWidget): self._task_name, api.Session["AVALON_PROJECT"] ) - pipeline.emit("after.workfile.save", [file_path]) - - self.workfile_created.emit(file_path) + # Trigger after save events + pipeline.emit("after.workfile.save", [filepath]) + self.workfile_created.emit(filepath) + # Refresh files model self.refresh() def on_file_select(self): self.file_selected.emit(self._get_selected_filepath()) - def initialize_work_directory(self): - """Initialize Work Directory. - - This is used when the Work Directory does not exist yet. - - This finds the current AVALON_APP_NAME and tries to triggers its - `.toml` initialization step. Note that this will only be valid - whenever `AVALON_APP_NAME` is actually set in the current session. - - """ - - # Inputs (from the switched session and running app) - session = api.Session.copy() - changes = pipeline.compute_session_changes( - session, - asset=self._get_asset_doc(), - task=self._task_name, - template_key=self.template_key - ) - session.update(changes) - - # Prepare documents to get workdir data - project_doc = io.find_one({"type": "project"}) - asset_doc = io.find_one( - { - "type": "asset", - "name": session["AVALON_ASSET"] - } - ) - task_name = session["AVALON_TASK"] - host_name = session["AVALON_APP"] - - # Get workdir from collected documents - workdir = get_workdir(project_doc, asset_doc, task_name, host_name) - # Create workdir if does not exist yet - if not os.path.exists(workdir): - os.makedirs(workdir) - - # Force a full to the asset as opposed to just self.refresh() so - # that it will actually check again whether the Work directory exists - self.set_asset_task(self._asset_id, self._task_name, self._task_type) - def refresh(self): """Refresh listed files for current selection in the interface""" self.files_model.refresh() From 3223d7061e360860b31ca14ca11c10e2efa033b9 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 11 Jan 2022 22:25:15 +0100 Subject: [PATCH 036/123] Refactor cycle validator naming to be more generic (less specific to 'rig') --- ...alidate_rig_cycle_error.py => validate_cycle_error.py} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename openpype/hosts/maya/plugins/publish/{validate_rig_cycle_error.py => validate_cycle_error.py} (77%) diff --git a/openpype/hosts/maya/plugins/publish/validate_rig_cycle_error.py b/openpype/hosts/maya/plugins/publish/validate_cycle_error.py similarity index 77% rename from openpype/hosts/maya/plugins/publish/validate_rig_cycle_error.py rename to openpype/hosts/maya/plugins/publish/validate_cycle_error.py index 03ae47d645..d4faf2e562 100644 --- a/openpype/hosts/maya/plugins/publish/validate_rig_cycle_error.py +++ b/openpype/hosts/maya/plugins/publish/validate_cycle_error.py @@ -8,11 +8,11 @@ import openpype.api import openpype.hosts.maya.api.action -class ValidateRigCycleError(pyblish.api.InstancePlugin): - """Validate rig nodes produce have no cycle errors.""" +class ValidateCycleError(pyblish.api.InstancePlugin): + """Validate nodes produce no cycle errors.""" order = openpype.api.ValidateContentsOrder + 0.05 - label = "Rig Cycle Errors" + label = "Cycle Errors" hosts = ["maya"] families = ["rig"] actions = [openpype.hosts.maya.api.action.SelectInvalidAction] @@ -21,7 +21,7 @@ class ValidateRigCycleError(pyblish.api.InstancePlugin): def process(self, instance): invalid = self.get_invalid(instance) if invalid: - raise RuntimeError("Rig nodes produce a cycle error: %s" % invalid) + raise RuntimeError("Nodes produce a cycle error: %s" % invalid) @classmethod def get_invalid(cls, instance): From 61f7ae214c3364ceec973414bc25bc79a927f5d1 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 11 Jan 2022 23:02:10 +0100 Subject: [PATCH 037/123] Allow customizing ValidateCycleErrors in settings - default to only "rig" family --- .../defaults/project_settings/maya.json | 7 +++++ .../schemas/schema_maya_publish.json | 27 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index b75b0168ec..04b8c58673 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -175,6 +175,13 @@ "whitelist_native_plugins": false, "authorized_plugins": [] }, + "ValidateCycleError": { + "enabled": true, + "optional": false, + "families": [ + "rig" + ] + }, "ValidateRenderSettings": { "arnold_render_attributes": [], "vray_render_attributes": [], diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json index 606dd6c2bb..3c9a783a99 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json @@ -118,6 +118,33 @@ ] }, + { + "type": "dict", + "collapsible": true, + "checkbox_key": "enabled", + "key": "ValidateCycleError", + "label": "Validate Cycle Error", + "is_group": true, + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "key": "families", + "label": "Families", + "type": "list", + "object_type": "text" + } + ] + }, + { "type": "dict", "collapsible": true, From ac4302793b58c0e62f89ddee1764b3697bfc097b Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Wed, 12 Jan 2022 13:34:27 +0100 Subject: [PATCH 038/123] fix multiple copies of loaded proxy assignment --- openpype/tools/mayalookassigner/commands.py | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/openpype/tools/mayalookassigner/commands.py b/openpype/tools/mayalookassigner/commands.py index a1f26f01ab..b9402d8ea1 100644 --- a/openpype/tools/mayalookassigner/commands.py +++ b/openpype/tools/mayalookassigner/commands.py @@ -116,8 +116,9 @@ def create_asset_id_hash(nodes): ids = get_alembic_ids_cache(path) for k, _ in ids.items(): pid = k.split(":")[0] - if not node_id_hash.get(pid): - node_id_hash[pid] = [node] + if node not in node_id_hash[pid]: + node_id_hash[pid].append(node) + else: value = lib.get_id(node) if value is None: @@ -150,20 +151,6 @@ def create_items_from_nodes(nodes): id_hashes = create_asset_id_hash(nodes) - # get ids from alembic - if cmds.pluginInfo('vrayformaya', query=True, loaded=True): - vray_proxy_nodes = cmds.ls(nodes, type="VRayProxy") - for vp in vray_proxy_nodes: - path = cmds.getAttr("{}.fileName".format(vp)) - ids = get_alembic_ids_cache(path) - parent_id = {} - for k, _ in ids.items(): - pid = k.split(":")[0] - if not parent_id.get(pid): - parent_id[pid] = [vp] - print("Adding ids from alembic {}".format(path)) - id_hashes.update(parent_id) - if not id_hashes: log.warning("No id hashes") return asset_view_items From 34a9269688290169d072fe1786c89674d5015047 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 12 Jan 2022 14:33:31 +0100 Subject: [PATCH 039/123] Refactor publish families `mayaAscii` -> `mayaScene` --- .../projects_schema/schemas/template_publish_families.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/template_publish_families.json b/openpype/settings/entities/schemas/projects_schema/schemas/template_publish_families.json index 9db1427562..b5e33e2cf9 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/template_publish_families.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/template_publish_families.json @@ -17,7 +17,7 @@ {"editorial": "editorial"}, {"layout": "layout"}, {"look": "look"}, - {"mayaAscii": "mayaAscii"}, + {"mayaScene": "mayaScene"}, {"model": "model"}, {"pointcache": "pointcache"}, {"reference": "reference"}, From 41f22ff86558b700ea08515340c3134a89c74de5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jan 2022 04:10:59 +0000 Subject: [PATCH 040/123] build(deps): bump pillow from 8.4.0 to 9.0.0 Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.4.0 to 9.0.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/8.4.0...9.0.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- poetry.lock | 123 +++++++++++++++++++++++++++++++------------------ pyproject.toml | 2 +- 2 files changed, 80 insertions(+), 45 deletions(-) diff --git a/poetry.lock b/poetry.lock index f513b76611..3b6931f21f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -789,11 +789,11 @@ six = "*" [[package]] name = "pillow" -version = "8.4.0" +version = "9.0.0" description = "Python Imaging Library (Fork)" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [[package]] name = "platformdirs" @@ -1580,7 +1580,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes [metadata] lock-version = "1.1" python-versions = "3.7.*" -content-hash = "877c1c6292735f495d915fc6aa85450eb20fc63f266a9c6bf7ba1125af3579a5" +content-hash = "79f05a4232aae63e024dd16678ccb173318cbdca5b54e04d320f36fd5d916b5c" [metadata.files] acre = [] @@ -1668,10 +1668,13 @@ babel = [ {file = "Babel-2.9.1.tar.gz", hash = "sha256:bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0"}, ] bcrypt = [ + {file = "bcrypt-3.2.0-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:b589229207630484aefe5899122fb938a5b017b0f4349f769b8c13e78d99a8fd"}, {file = "bcrypt-3.2.0-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:c95d4cbebffafcdd28bd28bb4e25b31c50f6da605c81ffd9ad8a3d1b2ab7b1b6"}, {file = "bcrypt-3.2.0-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:63d4e3ff96188e5898779b6057878fecf3f11cfe6ec3b313ea09955d587ec7a7"}, {file = "bcrypt-3.2.0-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:cd1ea2ff3038509ea95f687256c46b79f5fc382ad0aa3664d200047546d511d1"}, {file = "bcrypt-3.2.0-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:cdcdcb3972027f83fe24a48b1e90ea4b584d35f1cc279d76de6fc4b13376239d"}, + {file = "bcrypt-3.2.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:a0584a92329210fcd75eb8a3250c5a941633f8bfaf2a18f81009b097732839b7"}, + {file = "bcrypt-3.2.0-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:56e5da069a76470679f312a7d3d23deb3ac4519991a0361abc11da837087b61d"}, {file = "bcrypt-3.2.0-cp36-abi3-win32.whl", hash = "sha256:a67fb841b35c28a59cebed05fbd3e80eea26e6d75851f0574a9273c80f3e9b55"}, {file = "bcrypt-3.2.0-cp36-abi3-win_amd64.whl", hash = "sha256:81fec756feff5b6818ea7ab031205e1d323d8943d237303baca2c5f9c7846f34"}, {file = "bcrypt-3.2.0.tar.gz", hash = "sha256:5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"}, @@ -1972,12 +1975,28 @@ log4mongo = [ {file = "log4mongo-1.7.0.tar.gz", hash = "sha256:dc374617206162a0b14167fbb5feac01dbef587539a235dadba6200362984a68"}, ] markupsafe = [ + {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"}, @@ -1986,14 +2005,27 @@ markupsafe = [ {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"}, {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"}, {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"}, {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"}, {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"}, @@ -2003,6 +2035,12 @@ markupsafe = [ {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"}, {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"}, {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"}, {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"}, {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"}, {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"}, @@ -2103,47 +2141,38 @@ pathlib2 = [ {file = "pathlib2-2.3.6.tar.gz", hash = "sha256:7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f"}, ] pillow = [ - {file = "Pillow-8.4.0-cp310-cp310-macosx_10_10_universal2.whl", hash = "sha256:81f8d5c81e483a9442d72d182e1fb6dcb9723f289a57e8030811bac9ea3fef8d"}, - {file = "Pillow-8.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3f97cfb1e5a392d75dd8b9fd274d205404729923840ca94ca45a0af57e13dbe6"}, - {file = "Pillow-8.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eb9fc393f3c61f9054e1ed26e6fe912c7321af2f41ff49d3f83d05bacf22cc78"}, - {file = "Pillow-8.4.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d82cdb63100ef5eedb8391732375e6d05993b765f72cb34311fab92103314649"}, - {file = "Pillow-8.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:62cc1afda735a8d109007164714e73771b499768b9bb5afcbbee9d0ff374b43f"}, - {file = "Pillow-8.4.0-cp310-cp310-win32.whl", hash = "sha256:e3dacecfbeec9a33e932f00c6cd7996e62f53ad46fbe677577394aaa90ee419a"}, - {file = "Pillow-8.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:620582db2a85b2df5f8a82ddeb52116560d7e5e6b055095f04ad828d1b0baa39"}, - {file = "Pillow-8.4.0-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:1bc723b434fbc4ab50bb68e11e93ce5fb69866ad621e3c2c9bdb0cd70e345f55"}, - {file = "Pillow-8.4.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:72cbcfd54df6caf85cc35264c77ede902452d6df41166010262374155947460c"}, - {file = "Pillow-8.4.0-cp36-cp36m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:70ad9e5c6cb9b8487280a02c0ad8a51581dcbbe8484ce058477692a27c151c0a"}, - {file = "Pillow-8.4.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:25a49dc2e2f74e65efaa32b153527fc5ac98508d502fa46e74fa4fd678ed6645"}, - {file = "Pillow-8.4.0-cp36-cp36m-win32.whl", hash = "sha256:93ce9e955cc95959df98505e4608ad98281fff037350d8c2671c9aa86bcf10a9"}, - {file = "Pillow-8.4.0-cp36-cp36m-win_amd64.whl", hash = "sha256:2e4440b8f00f504ee4b53fe30f4e381aae30b0568193be305256b1462216feff"}, - {file = "Pillow-8.4.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:8c803ac3c28bbc53763e6825746f05cc407b20e4a69d0122e526a582e3b5e153"}, - {file = "Pillow-8.4.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c8a17b5d948f4ceeceb66384727dde11b240736fddeda54ca740b9b8b1556b29"}, - {file = "Pillow-8.4.0-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1394a6ad5abc838c5cd8a92c5a07535648cdf6d09e8e2d6df916dfa9ea86ead8"}, - {file = "Pillow-8.4.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:792e5c12376594bfcb986ebf3855aa4b7c225754e9a9521298e460e92fb4a488"}, - {file = "Pillow-8.4.0-cp37-cp37m-win32.whl", hash = "sha256:d99ec152570e4196772e7a8e4ba5320d2d27bf22fdf11743dd882936ed64305b"}, - {file = "Pillow-8.4.0-cp37-cp37m-win_amd64.whl", hash = "sha256:7b7017b61bbcdd7f6363aeceb881e23c46583739cb69a3ab39cb384f6ec82e5b"}, - {file = "Pillow-8.4.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:d89363f02658e253dbd171f7c3716a5d340a24ee82d38aab9183f7fdf0cdca49"}, - {file = "Pillow-8.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0a0956fdc5defc34462bb1c765ee88d933239f9a94bc37d132004775241a7585"}, - {file = "Pillow-8.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5b7bb9de00197fb4261825c15551adf7605cf14a80badf1761d61e59da347779"}, - {file = "Pillow-8.4.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:72b9e656e340447f827885b8d7a15fc8c4e68d410dc2297ef6787eec0f0ea409"}, - {file = "Pillow-8.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a5a4532a12314149d8b4e4ad8ff09dde7427731fcfa5917ff16d0291f13609df"}, - {file = "Pillow-8.4.0-cp38-cp38-win32.whl", hash = "sha256:82aafa8d5eb68c8463b6e9baeb4f19043bb31fefc03eb7b216b51e6a9981ae09"}, - {file = "Pillow-8.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:066f3999cb3b070a95c3652712cffa1a748cd02d60ad7b4e485c3748a04d9d76"}, - {file = "Pillow-8.4.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:5503c86916d27c2e101b7f71c2ae2cddba01a2cf55b8395b0255fd33fa4d1f1a"}, - {file = "Pillow-8.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4acc0985ddf39d1bc969a9220b51d94ed51695d455c228d8ac29fcdb25810e6e"}, - {file = "Pillow-8.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0b052a619a8bfcf26bd8b3f48f45283f9e977890263e4571f2393ed8898d331b"}, - {file = "Pillow-8.4.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:493cb4e415f44cd601fcec11c99836f707bb714ab03f5ed46ac25713baf0ff20"}, - {file = "Pillow-8.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8831cb7332eda5dc89b21a7bce7ef6ad305548820595033a4b03cf3091235ed"}, - {file = "Pillow-8.4.0-cp39-cp39-win32.whl", hash = "sha256:5e9ac5f66616b87d4da618a20ab0a38324dbe88d8a39b55be8964eb520021e02"}, - {file = "Pillow-8.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:3eb1ce5f65908556c2d8685a8f0a6e989d887ec4057326f6c22b24e8a172c66b"}, - {file = "Pillow-8.4.0-pp36-pypy36_pp73-macosx_10_10_x86_64.whl", hash = "sha256:ddc4d832a0f0b4c52fff973a0d44b6c99839a9d016fe4e6a1cb8f3eea96479c2"}, - {file = "Pillow-8.4.0-pp36-pypy36_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9a3e5ddc44c14042f0844b8cf7d2cd455f6cc80fd7f5eefbe657292cf601d9ad"}, - {file = "Pillow-8.4.0-pp36-pypy36_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c70e94281588ef053ae8998039610dbd71bc509e4acbc77ab59d7d2937b10698"}, - {file = "Pillow-8.4.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:3862b7256046fcd950618ed22d1d60b842e3a40a48236a5498746f21189afbbc"}, - {file = "Pillow-8.4.0-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4901622493f88b1a29bd30ec1a2f683782e57c3c16a2dbc7f2595ba01f639df"}, - {file = "Pillow-8.4.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84c471a734240653a0ec91dec0996696eea227eafe72a33bd06c92697728046b"}, - {file = "Pillow-8.4.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:244cf3b97802c34c41905d22810846802a3329ddcb93ccc432870243211c79fc"}, - {file = "Pillow-8.4.0.tar.gz", hash = "sha256:b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed"}, + {file = "Pillow-9.0.0-cp310-cp310-macosx_10_10_universal2.whl", hash = "sha256:113723312215b25c22df1fdf0e2da7a3b9c357a7d24a93ebbe80bfda4f37a8d4"}, + {file = "Pillow-9.0.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:bb47a548cea95b86494a26c89d153fd31122ed65255db5dcbc421a2d28eb3379"}, + {file = "Pillow-9.0.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:31b265496e603985fad54d52d11970383e317d11e18e856971bdbb86af7242a4"}, + {file = "Pillow-9.0.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d154ed971a4cc04b93a6d5b47f37948d1f621f25de3e8fa0c26b2d44f24e3e8f"}, + {file = "Pillow-9.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:80fe92813d208ce8aa7d76da878bdc84b90809f79ccbad2a288e9bcbeac1d9bd"}, + {file = "Pillow-9.0.0-cp310-cp310-win32.whl", hash = "sha256:d5dcea1387331c905405b09cdbfb34611050cc52c865d71f2362f354faee1e9f"}, + {file = "Pillow-9.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:52abae4c96b5da630a8b4247de5428f593465291e5b239f3f843a911a3cf0105"}, + {file = "Pillow-9.0.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:72c3110228944019e5f27232296c5923398496b28be42535e3b2dc7297b6e8b6"}, + {file = "Pillow-9.0.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97b6d21771da41497b81652d44191489296555b761684f82b7b544c49989110f"}, + {file = "Pillow-9.0.0-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:72f649d93d4cc4d8cf79c91ebc25137c358718ad75f99e99e043325ea7d56100"}, + {file = "Pillow-9.0.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7aaf07085c756f6cb1c692ee0d5a86c531703b6e8c9cae581b31b562c16b98ce"}, + {file = "Pillow-9.0.0-cp37-cp37m-win32.whl", hash = "sha256:03b27b197deb4ee400ed57d8d4e572d2d8d80f825b6634daf6e2c18c3c6ccfa6"}, + {file = "Pillow-9.0.0-cp37-cp37m-win_amd64.whl", hash = "sha256:a09a9d4ec2b7887f7a088bbaacfd5c07160e746e3d47ec5e8050ae3b2a229e9f"}, + {file = "Pillow-9.0.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:490e52e99224858f154975db61c060686df8a6b3f0212a678e5d2e2ce24675c9"}, + {file = "Pillow-9.0.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:500d397ddf4bbf2ca42e198399ac13e7841956c72645513e8ddf243b31ad2128"}, + {file = "Pillow-9.0.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ebd8b9137630a7bbbff8c4b31e774ff05bbb90f7911d93ea2c9371e41039b52"}, + {file = "Pillow-9.0.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd0e5062f11cb3e730450a7d9f323f4051b532781026395c4323b8ad055523c4"}, + {file = "Pillow-9.0.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9f3b4522148586d35e78313db4db0df4b759ddd7649ef70002b6c3767d0fdeb7"}, + {file = "Pillow-9.0.0-cp38-cp38-win32.whl", hash = "sha256:0b281fcadbb688607ea6ece7649c5d59d4bbd574e90db6cd030e9e85bde9fecc"}, + {file = "Pillow-9.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:b5050d681bcf5c9f2570b93bee5d3ec8ae4cf23158812f91ed57f7126df91762"}, + {file = "Pillow-9.0.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:c2067b3bb0781f14059b112c9da5a91c80a600a97915b4f48b37f197895dd925"}, + {file = "Pillow-9.0.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2d16b6196fb7a54aff6b5e3ecd00f7c0bab1b56eee39214b2b223a9d938c50af"}, + {file = "Pillow-9.0.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:98cb63ca63cb61f594511c06218ab4394bf80388b3d66cd61d0b1f63ee0ea69f"}, + {file = "Pillow-9.0.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bc462d24500ba707e9cbdef436c16e5c8cbf29908278af053008d9f689f56dee"}, + {file = "Pillow-9.0.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3586e12d874ce2f1bc875a3ffba98732ebb12e18fb6d97be482bd62b56803281"}, + {file = "Pillow-9.0.0-cp39-cp39-win32.whl", hash = "sha256:68e06f8b2248f6dc8b899c3e7ecf02c9f413aab622f4d6190df53a78b93d97a5"}, + {file = "Pillow-9.0.0-cp39-cp39-win_amd64.whl", hash = "sha256:6579f9ba84a3d4f1807c4aab4be06f373017fc65fff43498885ac50a9b47a553"}, + {file = "Pillow-9.0.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:47f5cf60bcb9fbc46011f75c9b45a8b5ad077ca352a78185bd3e7f1d294b98bb"}, + {file = "Pillow-9.0.0-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2fd8053e1f8ff1844419842fd474fc359676b2e2a2b66b11cc59f4fa0a301315"}, + {file = "Pillow-9.0.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c5439bfb35a89cac50e81c751317faea647b9a3ec11c039900cd6915831064d"}, + {file = "Pillow-9.0.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:95545137fc56ce8c10de646074d242001a112a92de169986abd8c88c27566a05"}, + {file = "Pillow-9.0.0.tar.gz", hash = "sha256:ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e"}, ] platformdirs = [ {file = "platformdirs-2.4.0-py3-none-any.whl", hash = "sha256:8868bbe3c3c80d42f20156f22e7131d2fb321f5bc86a2a345375c6481a67021d"}, @@ -2392,6 +2421,8 @@ pynput = [ ] pyobjc-core = [ {file = "pyobjc-core-7.3.tar.gz", hash = "sha256:5081aedf8bb40aac1a8ad95adac9e44e148a882686ded614adf46bb67fd67574"}, + {file = "pyobjc_core-7.3-1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a1f1e6b457127cbf2b5bd2b94520a7c89fb590b739911eadb2b0499a3a5b0e6f"}, + {file = "pyobjc_core-7.3-1-cp38-cp38-macosx_11_0_universal2.whl", hash = "sha256:ed708cc47bae8b711f81f252af09898a5f986c7a38cec5ad5623d571d328bff8"}, {file = "pyobjc_core-7.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:4e93ad769a20b908778fe950f62a843a6d8f0fa71996e5f3cc9fab5ae7d17771"}, {file = "pyobjc_core-7.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:9f63fd37bbf3785af4ddb2f86cad5ca81c62cfc7d1c0099637ca18343c3656c1"}, {file = "pyobjc_core-7.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e9b1311f72f2e170742a7ee3a8149f52c35158dc024a21e88d6f1e52ba5d718b"}, @@ -2410,6 +2441,8 @@ pyobjc-framework-applicationservices = [ ] pyobjc-framework-cocoa = [ {file = "pyobjc-framework-Cocoa-7.3.tar.gz", hash = "sha256:b18d05e7a795a3455ad191c3e43d6bfa673c2a4fd480bb1ccf57191051b80b7e"}, + {file = "pyobjc_framework_Cocoa-7.3-1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1e31376806e5de883a1d7c7c87d9ff2a8b09fc05d267e0dfce6e42409fb70c67"}, + {file = "pyobjc_framework_Cocoa-7.3-1-cp38-cp38-macosx_11_0_universal2.whl", hash = "sha256:d999387927284346035cb63ebb51f86331abc41f9376f9a6970e7f18207db392"}, {file = "pyobjc_framework_Cocoa-7.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:9edffdfa6dd1f71f21b531c3e61fdd3e4d5d3bf6c5a528c98e88828cd60bac11"}, {file = "pyobjc_framework_Cocoa-7.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:35a6340437a4e0109a302150b7d1f6baf57004ccf74834f9e6062fcafe2fd8d7"}, {file = "pyobjc_framework_Cocoa-7.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7c3886f2608ab3ed02482f8b2ebf9f782b324c559e84b52cfd92dba8a1109872"}, @@ -2418,6 +2451,8 @@ pyobjc-framework-cocoa = [ ] pyobjc-framework-quartz = [ {file = "pyobjc-framework-Quartz-7.3.tar.gz", hash = "sha256:98812844c34262def980bdf60923a875cd43428a8375b6fd53bd2cd800eccf0b"}, + {file = "pyobjc_framework_Quartz-7.3-1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1139bc6874c0f8b58f0b8602015e0994198bc506a6bcec1071208de32b55ed26"}, + {file = "pyobjc_framework_Quartz-7.3-1-cp38-cp38-macosx_11_0_universal2.whl", hash = "sha256:d94a3ed7051266c52392ec07d3b5adbf28d4be83341a24df0d88639344dcd84f"}, {file = "pyobjc_framework_Quartz-7.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1ef18f5a16511ded65980bf4f5983ea5d35c88224dbad1b3112abd29c60413ea"}, {file = "pyobjc_framework_Quartz-7.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3b41eec8d4b10c7c7e011e2f9051367f5499ef315ba52dfbae573c3a2e05469c"}, {file = "pyobjc_framework_Quartz-7.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2c65456ed045dfe1711d0298734e5a3ad670f8c770f7eb3b19979256c388bdd2"}, diff --git a/pyproject.toml b/pyproject.toml index f9155f05a3..481c93b4f8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ jsonschema = "^3.2.0" keyring = "^22.0.1" log4mongo = "^1.7" pathlib2= "^2.3.5" # deadline submit publish job only (single place, maybe not needed?) -Pillow = "^8.3" # only used for slates prototype +Pillow = "^9.0" # only used for slates prototype pyblish-base = "^1.8.8" pynput = "^1.7.2" # idle manager in tray pymongo = "^3.11.2" From 0941a8d9ed55a8fb16d56bc589c14b6e0fe3470a Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Fri, 14 Jan 2022 11:27:40 +0000 Subject: [PATCH 041/123] Added alembic support --- .../blender/plugins/publish/extract_layout.py | 29 +++++++++++-- .../hosts/unreal/plugins/load/load_layout.py | 41 +++++++++++++++++-- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/openpype/hosts/blender/plugins/publish/extract_layout.py b/openpype/hosts/blender/plugins/publish/extract_layout.py index f397e70892..af87204a6d 100644 --- a/openpype/hosts/blender/plugins/publish/extract_layout.py +++ b/openpype/hosts/blender/plugins/publish/extract_layout.py @@ -136,6 +136,7 @@ class ExtractLayout(openpype.api.Extractor): family = metadata["family"] self.log.debug("Parent: {}".format(parent)) + # Get blend reference blend = io.find_one( { "type": "representation", @@ -143,7 +144,10 @@ class ExtractLayout(openpype.api.Extractor): "name": "blend" }, projection={"_id": True}) - blend_id = blend["_id"] + blend_id = None + if blend: + blend_id = blend["_id"] + # Get fbx reference fbx = io.find_one( { "type": "representation", @@ -151,11 +155,28 @@ class ExtractLayout(openpype.api.Extractor): "name": "fbx" }, projection={"_id": True}) - fbx_id = fbx["_id"] + fbx_id = None + if fbx: + fbx_id = fbx["_id"] + # Get abc reference + abc = io.find_one( + { + "type": "representation", + "parent": io.ObjectId(parent), + "name": "abc" + }, + projection={"_id": True}) + abc_id = None + if abc: + abc_id = abc["_id"] json_element = {} - json_element["reference"] = str(blend_id) - json_element["reference_fbx"] = str(fbx_id) + if blend_id: + json_element["reference"] = str(blend_id) + if fbx_id: + json_element["reference_fbx"] = str(fbx_id) + if abc_id: + json_element["reference_abc"] = str(abc_id) json_element["family"] = family json_element["instance_name"] = asset.name json_element["asset_name"] = metadata["asset_name"] diff --git a/openpype/hosts/unreal/plugins/load/load_layout.py b/openpype/hosts/unreal/plugins/load/load_layout.py index ce15e49ad8..19d0b74e3e 100644 --- a/openpype/hosts/unreal/plugins/load/load_layout.py +++ b/openpype/hosts/unreal/plugins/load/load_layout.py @@ -40,7 +40,7 @@ class LayoutLoader(api.Loader): return asset_containers - def _get_loader(self, loaders, family): + def _get_fbx_loader(self, loaders, family): name = "" if family == 'rig': name = "SkeletalMeshFBXLoader" @@ -58,6 +58,22 @@ class LayoutLoader(api.Loader): return None + def _get_abc_loader(self, loaders, family): + name = "" + if family == 'rig': + name = "SkeletalMeshAlembicLoader" + elif family == 'model': + name = "StaticMeshAlembicLoader" + + if name == "": + return None + + for loader in loaders: + if loader.__name__ == name: + return loader + + return None + def _process_family(self, assets, classname, transform, inst_name=None): ar = unreal.AssetRegistryHelpers.get_asset_registry() @@ -193,7 +209,17 @@ class LayoutLoader(api.Loader): actors_dict = {} for element in data: - reference = element.get('reference_fbx') + reference = None + if element.get('reference_fbx'): + reference = element.get('reference_fbx') + elif element.get('reference_abc'): + reference = element.get('reference_abc') + + # If reference is None, this element is skipped, as it cannot be + # imported in Unreal + if not reference: + continue + instance_name = element.get('instance_name') skeleton = None @@ -204,7 +230,13 @@ class LayoutLoader(api.Loader): family = element.get('family') loaders = api.loaders_from_representation( all_loaders, reference) - loader = self._get_loader(loaders, family) + + loader = None + + if reference == element.get('reference_fbx'): + loader = self._get_fbx_loader(loaders, family) + elif reference == element.get('reference_abc'): + loader = self._get_abc_loader(loaders, family) if not loader: continue @@ -222,7 +254,8 @@ class LayoutLoader(api.Loader): instances = [ item for item in data - if item.get('reference_fbx') == reference] + if (item.get('reference_fbx') == reference or + item.get('reference_abc') == reference)] for instance in instances: transform = instance.get('transform') From 66c762c63504ebdefbb2234fcdbd905f163beff6 Mon Sep 17 00:00:00 2001 From: Simone Barbieri Date: Fri, 14 Jan 2022 11:31:45 +0000 Subject: [PATCH 042/123] Hound fix --- openpype/hosts/blender/plugins/load/load_layout_blend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/blender/plugins/load/load_layout_blend.py b/openpype/hosts/blender/plugins/load/load_layout_blend.py index b7981e0fc8..0f5ae01a99 100644 --- a/openpype/hosts/blender/plugins/load/load_layout_blend.py +++ b/openpype/hosts/blender/plugins/load/load_layout_blend.py @@ -205,7 +205,7 @@ class BlendLayoutLoader(plugin.AssetLoader): plugin.deselect_all() local_obj.select_set(True) bpy.context.view_layer.objects.active = local_obj - if local_obj.library == None: + if local_obj.library is None: bpy.ops.object.mode_set(mode='EDIT') bpy.ops.object.hook_reset() bpy.ops.object.mode_set(mode='OBJECT') From 6e8e1173d8dcfeccbc944b976a1e0504642ea0cf Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 14 Jan 2022 17:42:59 +0100 Subject: [PATCH 043/123] Fix Load VDB to V-Ray for Maya (cherry picked from commit d53db6cd2b02a9b4ac251c70d600b47cc5e2493c) --- .../maya/plugins/load/load_vdb_to_vray.py | 239 ++++++++++++++++-- 1 file changed, 223 insertions(+), 16 deletions(-) diff --git a/openpype/hosts/maya/plugins/load/load_vdb_to_vray.py b/openpype/hosts/maya/plugins/load/load_vdb_to_vray.py index 80b453bd13..151731c13c 100644 --- a/openpype/hosts/maya/plugins/load/load_vdb_to_vray.py +++ b/openpype/hosts/maya/plugins/load/load_vdb_to_vray.py @@ -2,6 +2,72 @@ from avalon import api from openpype.api import get_project_settings import os +from maya import cmds + +# List of 3rd Party Channels Mapping names for VRayVolumeGrid +# See: https://docs.chaosgroup.com/display/VRAY4MAYA/Input +# #Input-3rdPartyChannelsMapping +THIRD_PARTY_CHANNELS = { + 2: "Smoke", + 1: "Temperature", + 10: "Fuel", + 4: "Velocity.x", + 5: "Velocity.y", + 6: "Velocity.z", + 7: "Red", + 8: "Green", + 9: "Blue", + 14: "Wavelet Energy", + 19: "Wavelet.u", + 20: "Wavelet.v", + 21: "Wavelet.w", + # These are not in UI or documentation but V-Ray does seem to set these. + 15: "AdvectionOrigin.x", + 16: "AdvectionOrigin.y", + 17: "AdvectionOrigin.z", + +} + + +def _fix_duplicate_vvg_callbacks(): + """Workaround to kill duplicate VRayVolumeGrids attribute callbacks. + + This fixes a huge lag in Maya on switching 3rd Party Channels Mappings + or to different .vdb file paths because it spams an attribute changed + callback: `vvgUserChannelMappingsUpdateUI`. + + ChaosGroup bug ticket: 154-008-9890 + + Found with: + - Maya 2019.2 on Windows 10 + - V-Ray: V-Ray Next for Maya, update 1 version 4.12.01.00001 + + Bug still present in: + - Maya 2022.1 on Windows 10 + - V-Ray 5 for Maya, Update 2.1 (v5.20.01 from Dec 16 2021) + + """ + # todo(roy): Remove when new V-Ray release fixes duplicate calls + + jobs = cmds.scriptJob(listJobs=True) + + matched = set() + for entry in jobs: + # Remove the number + index, callback = entry.split(":", 1) + callback = callback.strip() + + # Detect whether it is a `vvgUserChannelMappingsUpdateUI` + # attribute change callback + if callback.startswith('"-runOnce" 1 "-attributeChange" "'): + if '"vvgUserChannelMappingsUpdateUI(' in callback: + if callback in matched: + # If we've seen this callback before then + # delete the duplicate callback + cmds.scriptJob(kill=int(index)) + else: + matched.add(callback) + class LoadVDBtoVRay(api.Loader): @@ -14,15 +80,24 @@ class LoadVDBtoVRay(api.Loader): def load(self, context, name, namespace, data): - from maya import cmds import avalon.maya.lib as lib from avalon.maya.pipeline import containerise + assert os.path.exists(self.fname), ( + "Path does not exist: %s" % self.fname + ) + try: family = context["representation"]["context"]["family"] except ValueError: family = "vdbcache" + # Ensure V-ray is loaded with the vrayvolumegrid + if not cmds.pluginInfo("vrayformaya", query=True, loaded=True): + cmds.loadPlugin("vrayformaya") + if not cmds.pluginInfo("vrayvolumegrid", query=True, loaded=True): + cmds.loadPlugin("vrayvolumegrid") + # Check if viewport drawing engine is Open GL Core (compat) render_engine = None compatible = "OpenGLCoreProfileCompat" @@ -30,13 +105,11 @@ class LoadVDBtoVRay(api.Loader): render_engine = cmds.optionVar(query="vp2RenderingEngine") if not render_engine or render_engine != compatible: - raise RuntimeError("Current scene's settings are incompatible." - "See Preferences > Display > Viewport 2.0 to " - "set the render engine to '%s'" % compatible) + self.log.warning("Current scene's settings are incompatible." + "See Preferences > Display > Viewport 2.0 to " + "set the render engine to '%s'" % compatible) asset = context['asset'] - version = context["version"] - asset_name = asset["name"] namespace = namespace or lib.unique_namespace( asset_name + "_", @@ -45,7 +118,7 @@ class LoadVDBtoVRay(api.Loader): ) # Root group - label = "{}:{}".format(namespace, name) + label = "{}:{}_VDB".format(namespace, name) root = cmds.group(name=label, empty=True) settings = get_project_settings(os.environ['AVALON_PROJECT']) @@ -55,20 +128,25 @@ class LoadVDBtoVRay(api.Loader): if c is not None: cmds.setAttr(root + ".useOutlinerColor", 1) cmds.setAttr(root + ".outlinerColor", - (float(c[0])/255), - (float(c[1])/255), - (float(c[2])/255) + float(c[0])/255, + float(c[1])/255, + float(c[2])/255 ) - # Create VR + # Create VRayVolumeGrid grid_node = cmds.createNode("VRayVolumeGrid", - name="{}VVGShape".format(label), + name="{}Shape".format(label), parent=root) - # Set attributes - cmds.setAttr("{}.inFile".format(grid_node), self.fname, type="string") - cmds.setAttr("{}.inReadOffset".format(grid_node), - version["startFrames"]) + # Ensure .currentTime is connected to time1.outTime + cmds.connectAttr("time1.outTime", grid_node + ".currentTime") + + # Set path + self._set_path(grid_node, self.fname, show_preset_popup=True) + + # Lock the shape node so the user can't delete the transform/shape + # as if it was referenced + cmds.lockNode(grid_node, lock=True) nodes = [root, grid_node] self[:] = nodes @@ -79,3 +157,132 @@ class LoadVDBtoVRay(api.Loader): nodes=nodes, context=context, loader=self.__class__.__name__) + + def _set_path(self, grid_node, path, show_preset_popup=True): + + from openpype.hosts.maya.api.lib import attribute_values + from maya import cmds + + def _get_filename_from_folder(path): + # Using the sequence of .vdb files we check the frame range, etc. + # to set the filename with #### padding. + files = sorted(x for x in os.listdir(path) if x.endswith(".vdb")) + if not files: + raise RuntimeError("Couldn't find .vdb files in: %s" % path) + + if len(files) == 1: + # Ensure check for single file is also done in folder + fname = files[0] + else: + # Sequence + from avalon.vendor import clique + # todo: check support for negative frames as input + collections, remainder = clique.assemble(files) + assert len(collections) == 1, ( + "Must find a single image sequence, " + "found: %s" % (collections,) + ) + collection = collections[0] + + fname = collection.format('{head}{{padding}}{tail}') + padding = collection.padding + if padding == 0: + # Clique doesn't provide padding if the frame number never + # starts with a zero and thus has never any visual padding. + # So we fall back to the smallest frame number as padding. + padding = min(len(str(i)) for i in collection.indexes) + + # Supply frame/padding with # signs + padding_str = "#" * padding + fname = fname.format(padding=padding_str) + + return os.path.join(path, fname) + + # The path is either a single file or sequence in a folder so + # we do a quick lookup for our files + if os.path.isfile(path): + path = os.path.dirname(path) + path = _get_filename_from_folder(path) + + # Even when not applying a preset V-Ray will reset the 3rd Party + # Channels Mapping of the VRayVolumeGrid when setting the .inPath + # value. As such we try and preserve the values ourselves. + # Reported as ChaosGroup bug ticket: 154-011-2909  + # todo(roy): Remove when new V-Ray release preserves values + original_user_mapping = cmds.getAttr(grid_node + ".usrchmap") or "" + + # Workaround for V-Ray bug: fix lag on path change, see function + _fix_duplicate_vvg_callbacks() + + # Suppress preset pop-up if we want. + popup_attr = "{0}.inDontOfferPresets".format(grid_node) + popup = {popup_attr: not show_preset_popup} + with attribute_values(popup): + cmds.setAttr(grid_node + ".inPath", path, type="string") + + # Reapply the 3rd Party channels user mapping when no preset popup + # was shown to the user + if not show_preset_popup: + channels = cmds.getAttr(grid_node + ".usrchmapallch").split(";") + channels = set(channels) # optimize lookup + restored_mapping = "" + for entry in original_user_mapping.split(";"): + if not entry: + # Ignore empty entries + continue + + # If 3rd Party Channels selection channel still exists then + # add it again. + index, channel = entry.split(",") + attr = THIRD_PARTY_CHANNELS.get(int(index), + # Fallback for when a mapping + # was set that is not in the + # documentation + "???") + if channel in channels: + restored_mapping += entry + ";" + else: + self.log.warning("Can't preserve '%s' mapping due to " + "missing channel '%s' on node: " + "%s" % (attr, channel, grid_node)) + + if restored_mapping: + cmds.setAttr(grid_node + ".usrchmap", + restored_mapping, + type="string") + + def update(self, container, representation): + + path = api.get_representation_path(representation) + + # Find VRayVolumeGrid + members = cmds.sets(container['objectName'], query=True) + grid_nodes = cmds.ls(members, type="VRayVolumeGrid", long=True) + assert len(grid_nodes) > 0, "This is a bug" + + # Update the VRayVolumeGrid + for grid_node in grid_nodes: + self._set_path(grid_node, path=path, show_preset_popup=False) + + # Update container representation + cmds.setAttr(container["objectName"] + ".representation", + str(representation["_id"]), + type="string") + + def switch(self, container, representation): + self.update(container, representation) + + def remove(self, container): + + # Get all members of the avalon container, ensure they are unlocked + # and delete everything + members = cmds.sets(container['objectName'], query=True) + cmds.lockNode(members, lock=False) + cmds.delete([container['objectName']] + members) + + # Clean up the namespace + try: + cmds.namespace(removeNamespace=container['namespace'], + deleteNamespaceContent=True) + except RuntimeError: + pass From 8cb71742921357aae79e8f66c950d4aa3c1bd8bc Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 14 Jan 2022 17:56:37 +0100 Subject: [PATCH 044/123] Cosmetics --- .../hosts/maya/plugins/load/load_vdb_to_vray.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/maya/plugins/load/load_vdb_to_vray.py b/openpype/hosts/maya/plugins/load/load_vdb_to_vray.py index 151731c13c..ed561e1131 100644 --- a/openpype/hosts/maya/plugins/load/load_vdb_to_vray.py +++ b/openpype/hosts/maya/plugins/load/load_vdb_to_vray.py @@ -84,7 +84,7 @@ class LoadVDBtoVRay(api.Loader): from avalon.maya.pipeline import containerise assert os.path.exists(self.fname), ( - "Path does not exist: %s" % self.fname + "Path does not exist: %s" % self.fname ) try: @@ -128,10 +128,9 @@ class LoadVDBtoVRay(api.Loader): if c is not None: cmds.setAttr(root + ".useOutlinerColor", 1) cmds.setAttr(root + ".outlinerColor", - float(c[0])/255, - float(c[1])/255, - float(c[2])/255 - ) + float(c[0]) / 255, + float(c[1]) / 255, + float(c[2]) / 255) # Create VRayVolumeGrid grid_node = cmds.createNode("VRayVolumeGrid", @@ -179,8 +178,8 @@ class LoadVDBtoVRay(api.Loader): # todo: check support for negative frames as input collections, remainder = clique.assemble(files) assert len(collections) == 1, ( - "Must find a single image sequence, " - "found: %s" % (collections,) + "Must find a single image sequence, " + "found: %s" % (collections,) ) collection = collections[0] From abf0d2b6a0c1722a0fdf1a8e14c28da99c553ec9 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 14 Jan 2022 17:44:38 +0100 Subject: [PATCH 045/123] Add houdini for validate version (cherry picked from commit bc55371de067c75511fb7f906989cd4f3c2f5aaf) --- openpype/plugins/publish/validate_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/validate_version.py b/openpype/plugins/publish/validate_version.py index e48ce6e3c3..b94152ef2d 100644 --- a/openpype/plugins/publish/validate_version.py +++ b/openpype/plugins/publish/validate_version.py @@ -10,7 +10,7 @@ class ValidateVersion(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder label = "Validate Version" - hosts = ["nuke", "maya", "blender", "standalonepublisher"] + hosts = ["nuke", "maya", "houdini", "blender", "standalonepublisher"] optional = False active = True From 9a3a709149108efa45770a094ac1dacee9730d70 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Fri, 14 Jan 2022 17:45:08 +0100 Subject: [PATCH 046/123] Preserve VDB frame numbers on Integrating (cherry picked from commit 09fe8b3540f8a3cc2936d8c07e7bdf72a4690c26) --- openpype/hosts/houdini/plugins/publish/collect_instances.py | 3 +++ openpype/hosts/houdini/plugins/publish/extract_vdb_cache.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/openpype/hosts/houdini/plugins/publish/collect_instances.py b/openpype/hosts/houdini/plugins/publish/collect_instances.py index ac081ac297..12d118f0cc 100644 --- a/openpype/hosts/houdini/plugins/publish/collect_instances.py +++ b/openpype/hosts/houdini/plugins/publish/collect_instances.py @@ -74,6 +74,9 @@ class CollectInstances(pyblish.api.ContextPlugin): instance = context.create_instance(label) + # Include `families` using `family` data + instance.data["families"] = [instance.data["family"]] + instance[:] = [node] instance.data.update(data) diff --git a/openpype/hosts/houdini/plugins/publish/extract_vdb_cache.py b/openpype/hosts/houdini/plugins/publish/extract_vdb_cache.py index 78794acc97..113e1b0bcb 100644 --- a/openpype/hosts/houdini/plugins/publish/extract_vdb_cache.py +++ b/openpype/hosts/houdini/plugins/publish/extract_vdb_cache.py @@ -37,5 +37,7 @@ class ExtractVDBCache(openpype.api.Extractor): "ext": "vdb", "files": output, "stagingDir": staging_dir, + "frameStart": instance.data["frameStart"], + "frameEnd": instance.data["frameEnd"], } instance.data["representations"].append(representation) From 75d55b9ac5aee789ed6f6c1cb41677b67a34ad4e Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 14 Jan 2022 18:09:41 +0100 Subject: [PATCH 047/123] OP-1117 - added context menu to Launcher actions to skip opening last workfile Choice is persistent in Local Setting (only in DB, not exposed to GUI yet.) --- openpype/hooks/pre_global_host_data.py | 1 + openpype/hooks/pre_non_python_host_launch.py | 2 +- openpype/lib/applications.py | 5 ++ openpype/tools/launcher/actions.py | 4 +- openpype/tools/launcher/constants.py | 1 + openpype/tools/launcher/delegates.py | 13 ++- openpype/tools/launcher/models.py | 86 +++++++++++++++++++- openpype/tools/launcher/widgets.py | 39 ++++++++- 8 files changed, 145 insertions(+), 6 deletions(-) diff --git a/openpype/hooks/pre_global_host_data.py b/openpype/hooks/pre_global_host_data.py index 6b08cdb444..bae967e25f 100644 --- a/openpype/hooks/pre_global_host_data.py +++ b/openpype/hooks/pre_global_host_data.py @@ -43,6 +43,7 @@ class GlobalHostDataHook(PreLaunchHook): "env": self.launch_context.env, + "start_last_workfile": self.data.get("start_last_workfile"), "last_workfile_path": self.data.get("last_workfile_path"), "log": self.log diff --git a/openpype/hooks/pre_non_python_host_launch.py b/openpype/hooks/pre_non_python_host_launch.py index 29e40d28c8..8aa61a9027 100644 --- a/openpype/hooks/pre_non_python_host_launch.py +++ b/openpype/hooks/pre_non_python_host_launch.py @@ -40,7 +40,7 @@ class NonPythonHostHook(PreLaunchHook): ) # Add workfile path if exists workfile_path = self.data["last_workfile_path"] - if os.path.exists(workfile_path): + if workfile_path and os.path.exists(workfile_path): new_launch_args.append(workfile_path) # Append as whole list as these areguments should not be separated diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py index d0438e12a6..ab20d812e7 100644 --- a/openpype/lib/applications.py +++ b/openpype/lib/applications.py @@ -1490,6 +1490,11 @@ def _prepare_last_workfile(data, workdir): import avalon.api log = data["log"] + + if not data.get("start_last_workfile", True): + log.info("Explicitly forbidden to open last workfile, skipping") + return + _workdir_data = data.get("workdir_data") if not _workdir_data: log.info( diff --git a/openpype/tools/launcher/actions.py b/openpype/tools/launcher/actions.py index 4d86970f9c..fbaef05261 100644 --- a/openpype/tools/launcher/actions.py +++ b/openpype/tools/launcher/actions.py @@ -62,6 +62,7 @@ class ApplicationAction(api.Action): icon = None color = None order = 0 + data = {} _log = None required_session_keys = ( @@ -103,7 +104,8 @@ class ApplicationAction(api.Action): self.application.launch( project_name=project_name, asset_name=asset_name, - task_name=task_name + task_name=task_name, + **self.data ) except ApplictionExecutableNotFound as exc: diff --git a/openpype/tools/launcher/constants.py b/openpype/tools/launcher/constants.py index 7f394cb5ac..3747b0f0a4 100644 --- a/openpype/tools/launcher/constants.py +++ b/openpype/tools/launcher/constants.py @@ -7,6 +7,7 @@ VARIANT_GROUP_ROLE = QtCore.Qt.UserRole + 2 ACTION_ID_ROLE = QtCore.Qt.UserRole + 3 ANIMATION_START_ROLE = QtCore.Qt.UserRole + 4 ANIMATION_STATE_ROLE = QtCore.Qt.UserRole + 5 +FORCE_NOT_OPEN_WORKFILE_ROLE = QtCore.Qt.UserRole + 6 # Animation length in seconds ANIMATION_LEN = 7 diff --git a/openpype/tools/launcher/delegates.py b/openpype/tools/launcher/delegates.py index cef0f5e1a2..7b53658727 100644 --- a/openpype/tools/launcher/delegates.py +++ b/openpype/tools/launcher/delegates.py @@ -2,7 +2,8 @@ import time from Qt import QtCore, QtWidgets, QtGui from .constants import ( ANIMATION_START_ROLE, - ANIMATION_STATE_ROLE + ANIMATION_STATE_ROLE, + FORCE_NOT_OPEN_WORKFILE_ROLE ) @@ -69,6 +70,16 @@ class ActionDelegate(QtWidgets.QStyledItemDelegate): self._draw_animation(painter, option, index) super(ActionDelegate, self).paint(painter, option, index) + + if index.data(FORCE_NOT_OPEN_WORKFILE_ROLE): + rect = QtCore.QRectF(option.rect.x(), option.rect.height(), + 5, 5) + painter.setPen(QtCore.Qt.transparent) + painter.setBrush(QtGui.QColor(200, 0, 0)) + painter.drawEllipse(rect) + + painter.setBrush(self.extender_bg_brush) + is_group = False for group_role in self.group_roles: is_group = index.data(group_role) diff --git a/openpype/tools/launcher/models.py b/openpype/tools/launcher/models.py index 427475cb4b..d3fd7ac3b9 100644 --- a/openpype/tools/launcher/models.py +++ b/openpype/tools/launcher/models.py @@ -8,7 +8,8 @@ from .constants import ( ACTION_ROLE, GROUP_ROLE, VARIANT_GROUP_ROLE, - ACTION_ID_ROLE + ACTION_ID_ROLE, + FORCE_NOT_OPEN_WORKFILE_ROLE ) from .actions import ApplicationAction from Qt import QtCore, QtGui @@ -16,6 +17,8 @@ from avalon.vendor import qtawesome from avalon import style, api from openpype.lib import ApplicationManager +from openpype.settings.lib import get_local_settings, save_local_settings + log = logging.getLogger(__name__) @@ -75,7 +78,8 @@ class ActionModel(QtGui.QStandardItemModel): "group": None, "icon": app.icon, "color": getattr(app, "color", None), - "order": getattr(app, "order", None) or 0 + "order": getattr(app, "order", None) or 0, + "data": {} } ) @@ -179,11 +183,20 @@ class ActionModel(QtGui.QStandardItemModel): self.beginResetModel() + local_settings = get_local_settings() items = [] for order in sorted(items_by_order.keys()): for item in items_by_order[order]: item_id = str(uuid.uuid4()) item.setData(item_id, ACTION_ID_ROLE) + + if self.is_force_not_open_workfile(item, + local_settings): + label = item.text() + label += " (Not opening last workfile)" + item.setData(label, QtCore.Qt.ToolTipRole) + item.setData(True, FORCE_NOT_OPEN_WORKFILE_ROLE) + self.items_by_id[item_id] = item items.append(item) @@ -222,6 +235,75 @@ class ActionModel(QtGui.QStandardItemModel): key=lambda action: (action.order, action.name) ) + def update_force_not_open_workfile_settings(self, is_checked, action): + """Store/remove config for forcing to skip opening last workfile. + + Args: + is_checked (bool): True to add, False to remove + action (ApplicationAction) + """ + local_settings = get_local_settings() + + actual_data = self._prepare_compare_data(action) + + force_not_open_workfile = local_settings.get("force_not_open_workfile", + []) + final_local_sett = local_settings + if is_checked: + if not force_not_open_workfile: + final_local_sett["force_not_open_workfile"] = [] + + final_local_sett["force_not_open_workfile"].append(actual_data) + else: + final_local_sett["force_not_open_workfile"] = [] + for config in force_not_open_workfile: + if config != actual_data: + final_local_sett["force_not_open_workfile"].append(config) + + if not final_local_sett["force_not_open_workfile"]: + final_local_sett.pop("force_not_open_workfile") + + save_local_settings(final_local_sett) + + def is_force_not_open_workfile(self, item, local_settings): + """Checks if application for task is marked to not open workfile + + There might be specific tasks where is unwanted to open workfile right + always (broken file, low performance). This allows artist to mark to + skip opening for combination (project, asset, task_name, app) + + Args: + item (QStandardItem) + local_settings (dict) + """ + action = item.data(ACTION_ROLE) + actual_data = self._prepare_compare_data(action) + for config in local_settings.get("force_not_open_workfile", []): + if config == actual_data: + return True + + return False + + def _prepare_compare_data(self, action): + if isinstance(action, list) and action: + action = action[0] + + _session = copy.deepcopy(self.dbcon.Session) + session = { + key: value + for key, value in _session.items() + if value + } + + actual_data = { + "app_label": action.label.lower(), + "project_name": session["AVALON_PROJECT"], + "asset": session["AVALON_ASSET"], + "task_name": session["AVALON_TASK"] + } + + return actual_data + class ProjectModel(QtGui.QStandardItemModel): """List of projects""" diff --git a/openpype/tools/launcher/widgets.py b/openpype/tools/launcher/widgets.py index edda8d08b5..0c21fcb33d 100644 --- a/openpype/tools/launcher/widgets.py +++ b/openpype/tools/launcher/widgets.py @@ -15,7 +15,8 @@ from .constants import ( ACTION_ID_ROLE, ANIMATION_START_ROLE, ANIMATION_STATE_ROLE, - ANIMATION_LEN + ANIMATION_LEN, + FORCE_NOT_OPEN_WORKFILE_ROLE ) @@ -96,6 +97,7 @@ class ActionBar(QtWidgets.QWidget): view.setViewMode(QtWidgets.QListView.IconMode) view.setResizeMode(QtWidgets.QListView.Adjust) view.setSelectionMode(QtWidgets.QListView.NoSelection) + view.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) view.setEditTriggers(QtWidgets.QListView.NoEditTriggers) view.setWrapping(True) view.setGridSize(QtCore.QSize(70, 75)) @@ -135,6 +137,7 @@ class ActionBar(QtWidgets.QWidget): project_handler.projects_refreshed.connect(self._on_projects_refresh) view.clicked.connect(self.on_clicked) + view.customContextMenuRequested.connect(self.on_context_menu) def discover_actions(self): if self._animation_timer.isActive(): @@ -181,6 +184,38 @@ class ActionBar(QtWidgets.QWidget): self._animated_items.add(action_id) self._animation_timer.start() + def on_context_menu(self, point): + """Creates menu to force skip opening last workfile.""" + index = self.view.indexAt(point) + if not index.isValid(): + return + + action_item = index.data(ACTION_ROLE) + menu = QtWidgets.QMenu(self.view) + checkbox = QtWidgets.QCheckBox("Force not open last workfile", + menu) + if index.data(FORCE_NOT_OPEN_WORKFILE_ROLE): + checkbox.setChecked(True) + + checkbox.stateChanged.connect( + lambda: self.on_checkbox_changed(checkbox.isChecked(), + action_item)) + action = QtWidgets.QWidgetAction(menu) + action.setDefaultWidget(checkbox) + + menu.addAction(action) + + global_point = self.mapToGlobal(point) + action = menu.exec_(global_point) + if not action or not action.data(): + return + + return + + def on_checkbox_changed(self, is_checked, action): + self.model.update_force_not_open_workfile_settings(is_checked, action) + self.discover_actions() # repaint + def on_clicked(self, index): if not index or not index.isValid(): return @@ -189,6 +224,8 @@ class ActionBar(QtWidgets.QWidget): is_variant_group = index.data(VARIANT_GROUP_ROLE) if not is_group and not is_variant_group: action = index.data(ACTION_ROLE) + if index.data(FORCE_NOT_OPEN_WORKFILE_ROLE): + action.data["start_last_workfile"] = False self._start_animation(index) self.action_clicked.emit(action) return From 969dfdc69e2f820e67acf26ca783fef6af56e71c Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Fri, 14 Jan 2022 19:03:46 +0100 Subject: [PATCH 048/123] add basic support for extended static mesh workflow wip --- .../create/create_unreal_staticmesh.py | 33 +++++- .../hosts/maya/plugins/publish/clean_nodes.py | 27 +++++ .../publish/collect_unreal_staticmesh.py | 20 ++-- .../publish/extract_unreal_staticmesh.py | 28 +++++ .../validate_unreal_staticmesh_naming.py | 109 +++++++++--------- .../defaults/project_settings/global.json | 2 +- .../defaults/project_settings/maya.json | 22 +++- .../schemas/schema_maya_create.json | 36 +++++- .../schemas/schema_maya_publish.json | 25 ++++ 9 files changed, 230 insertions(+), 72 deletions(-) create mode 100644 openpype/hosts/maya/plugins/publish/clean_nodes.py create mode 100644 openpype/hosts/maya/plugins/publish/extract_unreal_staticmesh.py diff --git a/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py b/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py index db1684bbc8..30f024a160 100644 --- a/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py +++ b/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py @@ -1,11 +1,42 @@ -from openpype.hosts.maya.api import plugin +# -*- coding: utf-8 -*- +"""Creator for Unreal Static Meshes.""" +from openpype.hosts.maya.api import plugin, lib +from avalon.api import CreatorError, Session +from openpype.api import get_project_settings +from maya import cmds # noqa class CreateUnrealStaticMesh(plugin.Creator): + """Unreal Static Meshes with collisions.""" name = "staticMeshMain" label = "Unreal - Static Mesh" family = "unrealStaticMesh" icon = "cube" + dynamic_subset_keys = ["asset"] def __init__(self, *args, **kwargs): + """Constructor.""" super(CreateUnrealStaticMesh, self).__init__(*args, **kwargs) + self._project_settings = get_project_settings( + Session["AVALON_PROJECT"]) + + @classmethod + def get_dynamic_data( + cls, variant, task_name, asset_id, project_name, host_name + ): + dynamic_data = super(CreateUnrealStaticMesh, cls).get_dynamic_data( + variant, task_name, asset_id, project_name, host_name + ) + dynamic_data["asset"] = Session.get("AVALON_ASSET") + + return dynamic_data + + def process(self): + with lib.undo_chunk(): + instance = super(CreateUnrealStaticMesh, self).process() + content = cmds.sets(instance, query=True) + geometry = cmds.sets(name="geometry_SET", empty=True) + collisions = cmds.sets(name="collisions_SET", empty=True) + cmds.sets([geometry, collisions], forceElement=instance) + # todo: Iterate over collision prefixes and add them to correct + # sets. Put rest to the geometry set. diff --git a/openpype/hosts/maya/plugins/publish/clean_nodes.py b/openpype/hosts/maya/plugins/publish/clean_nodes.py new file mode 100644 index 0000000000..e6667b7036 --- /dev/null +++ b/openpype/hosts/maya/plugins/publish/clean_nodes.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +"""Cleanup leftover nodes.""" +from maya import cmds # noqa +import pyblish.api + + +class CleanNodesUp(pyblish.api.InstancePlugin): + """Cleans up the staging directory after a successful publish. + + This will also clean published renders and delete their parent directories. + + """ + + order = pyblish.api.IntegratorOrder + 10 + label = "Clean Nodes" + optional = True + active = True + + def process(self, instance): + if not instance.data.get("cleanNodes"): + self.log.info("nothing to clean") + + nodes_to_clean = instance.data.pop("cleanNodes") + self.log.info("Removing {} nodes".format(len(nodes_to_clean))) + for node in nodes_to_clean: + cmds.remove(node) + \ No newline at end of file diff --git a/openpype/hosts/maya/plugins/publish/collect_unreal_staticmesh.py b/openpype/hosts/maya/plugins/publish/collect_unreal_staticmesh.py index 5ab9643f4b..ad6398041b 100644 --- a/openpype/hosts/maya/plugins/publish/collect_unreal_staticmesh.py +++ b/openpype/hosts/maya/plugins/publish/collect_unreal_staticmesh.py @@ -4,25 +4,31 @@ import pyblish.api class CollectUnrealStaticMesh(pyblish.api.InstancePlugin): - """Collect unreal static mesh + """Collect Unreal Static Mesh Ensures always only a single frame is extracted (current frame). This also sets correct FBX options for later extraction. - Note: - This is a workaround so that the `pype.model` family can use the - same pointcache extractor implementation as animation and pointcaches. - This always enforces the "current" frame to be published. - """ order = pyblish.api.CollectorOrder + 0.2 - label = "Collect Model Data" + label = "Collect Unreal Static Meshes" families = ["unrealStaticMesh"] def process(self, instance): # add fbx family to trigger fbx extractor instance.data["families"].append("fbx") + # take the name from instance (without the `S_` prefix) + instance.data["staticMeshCombinedName"] = instance.name[1:] + + geometry_set = [i for i in instance if i == "geometry_SET"] + instance.data["membersToCombine"] = cmds.sets( + geometry_set, query=True) + + collision_set = [i for i in instance if i == "collisions_SET"] + instance.data["collisionMembers"] = cmds.sets( + collision_set, query=True) + # set fbx overrides on instance instance.data["smoothingGroups"] = True instance.data["smoothMesh"] = True diff --git a/openpype/hosts/maya/plugins/publish/extract_unreal_staticmesh.py b/openpype/hosts/maya/plugins/publish/extract_unreal_staticmesh.py new file mode 100644 index 0000000000..fd9cf69612 --- /dev/null +++ b/openpype/hosts/maya/plugins/publish/extract_unreal_staticmesh.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +"""Create Unreal Static Mesh data to be extracted as FBX.""" +import openpype.api +import pyblish.api +from maya import cmds # noqa + + +class ExtractUnrealStaticMesh(openpype.api.Extractor): + """Extract FBX from Maya. """ + + order = pyblish.api.ExtractorOrder - 0.1 + label = "Extract Unreal Static Mesh" + families = ["unrealStaticMesh"] + + def process(self, instance): + to_combine = instance.data.get("membersToCombine") + static_mesh_name = instance.data.get("staticMeshCombinedName") + self.log.info( + "merging {] into {}".format( + "+ ".join(to_combine), static_mesh_name)) + cmds.polyUnite( + *to_combine, + n=static_mesh_name) + + if not instance.data.get("cleanNodes"): + instance.data["cleanNodes"] = [] + + instance.data["cleanNodes"].append(static_mesh_name) diff --git a/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py b/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py index 99d6cfd4c5..e7df7c8cbb 100644 --- a/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py +++ b/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py @@ -1,18 +1,19 @@ # -*- coding: utf-8 -*- -from maya import cmds +from maya import cmds # noqa import pyblish.api import openpype.api import openpype.hosts.maya.api.action import re -class ValidateUnrealStaticmeshName(pyblish.api.InstancePlugin): +class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin): """Validate name of Unreal Static Mesh - Unreals naming convention states that staticMesh sould start with `SM` - prefix - SM_[Name]_## (Eg. SM_sube_01). This plugin also validates other - types of meshes - collision meshes: + Unreals naming convention states that staticMesh should start with `SM` + prefix - SM_[Name]_## (Eg. SM_sube_01).These prefixes can be configured + in Settings UI. This plugin also validates other types of + meshes - collision meshes: UBX_[RenderMeshName]_##: Boxes are created with the Box objects type in @@ -52,69 +53,69 @@ class ValidateUnrealStaticmeshName(pyblish.api.InstancePlugin): families = ["unrealStaticMesh"] label = "Unreal StaticMesh Name" actions = [openpype.hosts.maya.api.action.SelectInvalidAction] - regex_mesh = r"SM_(?P.*)_(\d{2})" - regex_collision = r"((UBX)|(UCP)|(USP)|(UCX))_(?P.*)_(\d{2})" + regex_mesh = r"(?P.*)_(\d{2})" + regex_collision = r"_(?P.*)_(\d{2})" @classmethod def get_invalid(cls, instance): - # find out if supplied transform is group or not - def is_group(groupName): - try: - children = cmds.listRelatives(groupName, children=True) - for child in children: - if not cmds.ls(child, transforms=True): - return False + invalid = [] + + combined_geometry_name = instance.data.get( + "staticMeshCombinedName", None) + if cls.validate_mesh: + # compile regex for testing names + regex_mesh = "{}{}".format( + ("_" + cls.static_mesh_prefix) or "", cls.regex_mesh + ) + sm_r = re.compile(regex_mesh) + if not sm_r.match(combined_geometry_name): + cls.log.error("Mesh doesn't comply with name validation.") return True - except Exception: + + if cls.validate_collision: + collision_set = instance.data.get("collisionMembers", None) + # soft-fail is there are no collision objects + if not collision_set: + cls.log.warning("No collision objects to validate.") return False - invalid = [] - content_instance = instance.data.get("setMembers", None) - if not content_instance: - cls.log.error("Instance has no nodes!") - return True - pass - descendants = cmds.listRelatives(content_instance, - allDescendents=True, - fullPath=True) or [] + regex_collision = "{}{}".format( + "({})_".format( + "|".join("(0}".format(p) for p in cls.collision_prefixes) + ) or "", cls.regex_collision + ) + cl_r = re.compile(regex_collision) - descendants = cmds.ls(descendants, noIntermediate=True, long=True) - trns = cmds.ls(descendants, long=False, type=('transform')) - - # filter out groups - filter = [node for node in trns if not is_group(node)] - - # compile regex for testing names - sm_r = re.compile(cls.regex_mesh) - cl_r = re.compile(cls.regex_collision) - - sm_names = [] - col_names = [] - for obj in filter: - sm_m = sm_r.match(obj) - if sm_m is None: - # test if it matches collision mesh - cl_r = sm_r.match(obj) - if cl_r is None: - cls.log.error("invalid mesh name on: {}".format(obj)) + for obj in collision_set: + cl_m = cl_r.match(obj) + if not cl_m: + cls.log.error("{} is invalid".format(obj)) + invalid.append(obj) + elif cl_m.group("renderName") != combined_geometry_name: + cls.log.error( + "Collision object name doesn't match" + "static mesh name: {} != {}".format( + cl_m.group("renderName"), + combined_geometry_name) + ) invalid.append(obj) - else: - col_names.append((cl_r.group("renderName"), obj)) - else: - sm_names.append(sm_m.group("renderName")) - - for c_mesh in col_names: - if c_mesh[0] not in sm_names: - cls.log.error(("collision name {} doesn't match any " - "static mesh names.").format(obj)) - invalid.append(c_mesh[1]) return invalid def process(self, instance): + # todo: load prefixes from creator settings. + + if not self.validate_mesh and not self.validate_collision: + self.log.info("Validation of both mesh and collision names" + "is disabled.") + return + + if not instance.data.get("collisionMembers", None): + self.log.info("There are no collision objects to validate") + return invalid = self.get_invalid(instance) if invalid: - raise RuntimeError("Model naming is invalid. See log.") + raise RuntimeError("Model naming is invalid. See log.") \ No newline at end of file diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index cff1259c98..2169a62746 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -219,7 +219,7 @@ "hosts": [], "task_types": [], "tasks": [], - "template": "{family}{Variant}" + "template": "{family}{variant}" }, { "families": [ diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index a756071106..67a7b84cdc 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -127,6 +127,13 @@ "enabled": true, "defaults": [ "Main" + ], + "static_mesh_prefix": "S_", + "collision_prefixes": [ + "UBX", + "UCP", + "USP", + "UCX" ] }, "CreateVrayProxy": { @@ -180,6 +187,11 @@ "whitelist_native_plugins": false, "authorized_plugins": [] }, + "ValidateUnrealStaticMeshName": { + "enabled": true, + "validate_mesh": false, + "validate_collision": true + }, "ValidateRenderSettings": { "arnold_render_attributes": [], "vray_render_attributes": [], @@ -197,6 +209,11 @@ "regex": "(.*)_(\\d)*_(?P.*)_(GEO)", "top_level_regex": ".*_GRP" }, + "ValidateModelContent": { + "enabled": true, + "optional": false, + "validate_top_group": true + }, "ValidateTransformNamingSuffix": { "enabled": true, "SUFFIX_NAMING_TABLE": { @@ -281,11 +298,6 @@ "optional": true, "active": true }, - "ValidateModelContent": { - "enabled": true, - "optional": false, - "validate_top_group": true - }, "ValidateNoAnimation": { "enabled": false, "optional": true, diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json index 088d5d1f96..0544b4bab7 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json @@ -66,6 +66,38 @@ } ] }, + { + "type": "dict", + "collapsible": true, + "key": "CreateUnrealStaticMesh", + "label": "Create Unreal - Static Mesh", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "list", + "key": "defaults", + "label": "Default Subsets", + "object_type": "text" + }, + { + "type": "text", + "key": "static_mesh_prefix", + "label": "Static Mesh Prefix" + }, + { + "type": "list", + "key": "collision_prefixes", + "label": "Collision Mesh Prefixes", + "object_type": "text" + } + ] + + }, { "type": "schema_template", "name": "template_create_plugin", @@ -118,10 +150,6 @@ "key": "CreateSetDress", "label": "Create Set Dress" }, - { - "key": "CreateUnrealStaticMesh", - "label": "Create Unreal - Static Mesh" - }, { "key": "CreateVrayProxy", "label": "Create VRay Proxy" diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json index 7c9a5a6b46..f4a371c6de 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json @@ -129,6 +129,31 @@ ] }, + { + "type": "dict", + "collapsible": true, + "key": "ValidateUnrealStaticMeshName", + "label": "Validate Unreal Static Mesh Name", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "validate_mesh", + "label": "Validate mesh Names " + }, + { + "type": "boolean", + "key": "validate_collision", + "label": "Validate collision names" + } + ] + }, + { "type": "dict", "collapsible": true, From 7e41dc49b675e1789fff31dbc9dfc3c5175f4d10 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sun, 16 Jan 2022 11:54:08 +0100 Subject: [PATCH 049/123] Allow to toggle family filters between "include" or "exclude" filtering --- openpype/settings/defaults/project_settings/global.json | 1 + .../projects_schema/schemas/schema_global_tools.json | 8 +++++++- openpype/tools/utils/lib.py | 8 ++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index cff1259c98..c418377682 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -297,6 +297,7 @@ "family_filter_profiles": [ { "hosts": [], + "is_include": true, "task_types": [], "filter_families": [] } diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_tools.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_tools.json index bb71c9bde6..863ec7f979 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_tools.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_tools.json @@ -267,7 +267,13 @@ "label": "Task types" }, { - "type": "splitter" + "type": "boolean", + "key": "is_include", + "label": "Exclude (OFF) / Include (ON)" + }, + { + "type": "label", + "label": "Include: show selected families by default. Hides others by default.
Exclude: hide selected families by default. Shows others by default." }, { "type": "template", diff --git a/openpype/tools/utils/lib.py b/openpype/tools/utils/lib.py index 6742df8557..886cdb5186 100644 --- a/openpype/tools/utils/lib.py +++ b/openpype/tools/utils/lib.py @@ -228,6 +228,7 @@ class FamilyConfigCache: self.dbcon = dbcon self.family_configs = {} self._family_filters_set = False + self._family_filters_is_include = True self._require_refresh = True @classmethod @@ -249,7 +250,7 @@ class FamilyConfigCache: "icon": self.default_icon() } if self._family_filters_set: - item["state"] = False + item["state"] = not self._family_filters_is_include return item def refresh(self, force=False): @@ -313,20 +314,23 @@ class FamilyConfigCache: matching_item = filter_profiles(profiles, profiles_filter) families = [] + is_include = True if matching_item: families = matching_item["filter_families"] + is_include = matching_item["is_include"] if not families: return self._family_filters_set = True + self._family_filters_is_include = is_include # Replace icons with a Qt icon we can use in the user interfaces for family in families: family_info = { "name": family, "icon": self.default_icon(), - "state": True + "state": is_include } self.family_configs[family] = family_info From cb489c055e987423104301493b71d05747a5729e Mon Sep 17 00:00:00 2001 From: karimmozlia Date: Mon, 17 Jan 2022 11:03:00 +0200 Subject: [PATCH 050/123] add family and representation --- openpype/hosts/maya/plugins/load/load_vrayproxy.py | 4 ++-- openpype/hosts/maya/vendor/studiolibrary | 1 + repos/avalon-core | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 160000 openpype/hosts/maya/vendor/studiolibrary diff --git a/openpype/hosts/maya/plugins/load/load_vrayproxy.py b/openpype/hosts/maya/plugins/load/load_vrayproxy.py index e70f40bf5a..2e86012d8d 100644 --- a/openpype/hosts/maya/plugins/load/load_vrayproxy.py +++ b/openpype/hosts/maya/plugins/load/load_vrayproxy.py @@ -17,8 +17,8 @@ from openpype.api import get_project_settings class VRayProxyLoader(api.Loader): """Load VRay Proxy with Alembic or VrayMesh.""" - families = ["vrayproxy"] - representations = ["vrmesh"] + families = ["vrayproxy", "model"] + representations = ["vrmesh", "abc"] label = "Import VRay Proxy" order = -10 diff --git a/openpype/hosts/maya/vendor/studiolibrary b/openpype/hosts/maya/vendor/studiolibrary new file mode 160000 index 0000000000..f29e350da9 --- /dev/null +++ b/openpype/hosts/maya/vendor/studiolibrary @@ -0,0 +1 @@ +Subproject commit f29e350da9e9508522a740a4f30efb93b99c89d3 diff --git a/repos/avalon-core b/repos/avalon-core index ffe9e910f1..7e5efd6885 160000 --- a/repos/avalon-core +++ b/repos/avalon-core @@ -1 +1 @@ -Subproject commit ffe9e910f1f382e222d457d8e4a8426c41ed43ae +Subproject commit 7e5efd6885330d84bb8495975bcab84df49bfa3d From 582b4a7aafc9a02baac9985c1dcbf103d950ba76 Mon Sep 17 00:00:00 2001 From: karimmozlia Date: Mon, 17 Jan 2022 12:17:42 +0200 Subject: [PATCH 051/123] test without adding family --- openpype/hosts/maya/plugins/load/load_vrayproxy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/load/load_vrayproxy.py b/openpype/hosts/maya/plugins/load/load_vrayproxy.py index 2e86012d8d..1e3222873f 100644 --- a/openpype/hosts/maya/plugins/load/load_vrayproxy.py +++ b/openpype/hosts/maya/plugins/load/load_vrayproxy.py @@ -17,7 +17,7 @@ from openpype.api import get_project_settings class VRayProxyLoader(api.Loader): """Load VRay Proxy with Alembic or VrayMesh.""" - families = ["vrayproxy", "model"] + families = ["vrayproxy"] representations = ["vrmesh", "abc"] label = "Import VRay Proxy" From 918d93b3391a621fadb683b2b6e82217a6e5fe98 Mon Sep 17 00:00:00 2001 From: karimmozlia Date: Mon, 17 Jan 2022 12:35:48 +0200 Subject: [PATCH 052/123] add model family --- openpype/hosts/maya/plugins/load/load_vrayproxy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/load/load_vrayproxy.py b/openpype/hosts/maya/plugins/load/load_vrayproxy.py index 1e3222873f..2e86012d8d 100644 --- a/openpype/hosts/maya/plugins/load/load_vrayproxy.py +++ b/openpype/hosts/maya/plugins/load/load_vrayproxy.py @@ -17,7 +17,7 @@ from openpype.api import get_project_settings class VRayProxyLoader(api.Loader): """Load VRay Proxy with Alembic or VrayMesh.""" - families = ["vrayproxy"] + families = ["vrayproxy", "model"] representations = ["vrmesh", "abc"] label = "Import VRay Proxy" From 987c1bc52560646bd818ed07c6e2d8d32850d838 Mon Sep 17 00:00:00 2001 From: karimmozlia Date: Mon, 17 Jan 2022 12:56:08 +0200 Subject: [PATCH 053/123] add animation and pointcache --- openpype/hosts/maya/plugins/load/load_vrayproxy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/load/load_vrayproxy.py b/openpype/hosts/maya/plugins/load/load_vrayproxy.py index 2e86012d8d..806cf1fd18 100644 --- a/openpype/hosts/maya/plugins/load/load_vrayproxy.py +++ b/openpype/hosts/maya/plugins/load/load_vrayproxy.py @@ -17,7 +17,7 @@ from openpype.api import get_project_settings class VRayProxyLoader(api.Loader): """Load VRay Proxy with Alembic or VrayMesh.""" - families = ["vrayproxy", "model"] + families = ["vrayproxy", "model", "pointcache", "animation"] representations = ["vrmesh", "abc"] label = "Import VRay Proxy" From c9b93837d6167c8c4111eb8a154b46c23049de0c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 17 Jan 2022 12:17:36 +0100 Subject: [PATCH 054/123] OP-1117 - switched from local settings to JSONRegistry LS change in UI might be destructive, create json file in user dir instead --- openpype/tools/launcher/models.py | 45 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/openpype/tools/launcher/models.py b/openpype/tools/launcher/models.py index d3fd7ac3b9..b872dda8c2 100644 --- a/openpype/tools/launcher/models.py +++ b/openpype/tools/launcher/models.py @@ -2,6 +2,7 @@ import uuid import copy import logging import collections +import appdirs from . import lib from .constants import ( @@ -15,9 +16,7 @@ from .actions import ApplicationAction from Qt import QtCore, QtGui from avalon.vendor import qtawesome from avalon import style, api -from openpype.lib import ApplicationManager - -from openpype.settings.lib import get_local_settings, save_local_settings +from openpype.lib import ApplicationManager, JSONSettingRegistry log = logging.getLogger(__name__) @@ -33,6 +32,13 @@ class ActionModel(QtGui.QStandardItemModel): # Cache of available actions self._registered_actions = list() self.items_by_id = {} + path = appdirs.user_data_dir("openpype", "pype_club") + self.launcher_registry = JSONSettingRegistry("launcher", path) + + try: + _ = self.launcher_registry.get_item("force_not_open_workfile") + except ValueError: + self.launcher_registry.set_item("force_not_open_workfile", []) def discover(self): """Set up Actions cache. Run this for each new project.""" @@ -183,7 +189,7 @@ class ActionModel(QtGui.QStandardItemModel): self.beginResetModel() - local_settings = get_local_settings() + stored = self.launcher_registry.get_item("force_not_open_workfile") items = [] for order in sorted(items_by_order.keys()): for item in items_by_order[order]: @@ -191,7 +197,7 @@ class ActionModel(QtGui.QStandardItemModel): item.setData(item_id, ACTION_ID_ROLE) if self.is_force_not_open_workfile(item, - local_settings): + stored): label = item.text() label += " (Not opening last workfile)" item.setData(label, QtCore.Qt.ToolTipRole) @@ -242,30 +248,21 @@ class ActionModel(QtGui.QStandardItemModel): is_checked (bool): True to add, False to remove action (ApplicationAction) """ - local_settings = get_local_settings() - actual_data = self._prepare_compare_data(action) - force_not_open_workfile = local_settings.get("force_not_open_workfile", - []) - final_local_sett = local_settings + stored = self.launcher_registry.get_item("force_not_open_workfile") if is_checked: - if not force_not_open_workfile: - final_local_sett["force_not_open_workfile"] = [] - - final_local_sett["force_not_open_workfile"].append(actual_data) + stored.append(actual_data) else: - final_local_sett["force_not_open_workfile"] = [] - for config in force_not_open_workfile: + final_values = [] + for config in stored: if config != actual_data: - final_local_sett["force_not_open_workfile"].append(config) + final_values.append(config) + stored = final_values - if not final_local_sett["force_not_open_workfile"]: - final_local_sett.pop("force_not_open_workfile") + self.launcher_registry.set_item("force_not_open_workfile", stored) - save_local_settings(final_local_sett) - - def is_force_not_open_workfile(self, item, local_settings): + def is_force_not_open_workfile(self, item, stored): """Checks if application for task is marked to not open workfile There might be specific tasks where is unwanted to open workfile right @@ -274,11 +271,11 @@ class ActionModel(QtGui.QStandardItemModel): Args: item (QStandardItem) - local_settings (dict) + stored (list) of dict """ action = item.data(ACTION_ROLE) actual_data = self._prepare_compare_data(action) - for config in local_settings.get("force_not_open_workfile", []): + for config in stored: if config == actual_data: return True From 14d05f5f077dc53f8c95fc5861c3122070d5eaf8 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 17 Jan 2022 13:14:35 +0100 Subject: [PATCH 055/123] OP-1117 - apply only on ApplicationAction --- openpype/tools/launcher/models.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/openpype/tools/launcher/models.py b/openpype/tools/launcher/models.py index b872dda8c2..1df41fbc9d 100644 --- a/openpype/tools/launcher/models.py +++ b/openpype/tools/launcher/models.py @@ -274,6 +274,12 @@ class ActionModel(QtGui.QStandardItemModel): stored (list) of dict """ action = item.data(ACTION_ROLE) + if isinstance(action, list) and action: + action = action[0] + + if ApplicationAction not in action.__bases__: + return False + actual_data = self._prepare_compare_data(action) for config in stored: if config == actual_data: From 66e032dc6fb507b54ede43a1fb964307ad8f46a7 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 17 Jan 2022 13:44:33 +0100 Subject: [PATCH 056/123] Update openpype/tools/launcher/models.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/tools/launcher/models.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/openpype/tools/launcher/models.py b/openpype/tools/launcher/models.py index 1df41fbc9d..0d57114e46 100644 --- a/openpype/tools/launcher/models.py +++ b/openpype/tools/launcher/models.py @@ -291,22 +291,13 @@ class ActionModel(QtGui.QStandardItemModel): if isinstance(action, list) and action: action = action[0] - _session = copy.deepcopy(self.dbcon.Session) - session = { - key: value - for key, value in _session.items() - if value - } - - actual_data = { + return { "app_label": action.label.lower(), - "project_name": session["AVALON_PROJECT"], - "asset": session["AVALON_ASSET"], - "task_name": session["AVALON_TASK"] + "project_name": self.dbcon.Session["AVALON_PROJECT"], + "asset": self.dbcon.Session["AVALON_ASSET"], + "task_name": self.dbcon.Session["AVALON_TASK"] } - return actual_data - class ProjectModel(QtGui.QStandardItemModel): """List of projects""" From 69f97476f921ab86ca984cea934889ede207606a Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 17 Jan 2022 14:45:39 +0100 Subject: [PATCH 057/123] OP-1117 - add check for ApplicationAction on context menu --- openpype/tools/launcher/models.py | 17 +++++++++++++---- openpype/tools/launcher/widgets.py | 3 +++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/openpype/tools/launcher/models.py b/openpype/tools/launcher/models.py index 0d57114e46..86c3d816b2 100644 --- a/openpype/tools/launcher/models.py +++ b/openpype/tools/launcher/models.py @@ -261,6 +261,18 @@ class ActionModel(QtGui.QStandardItemModel): stored = final_values self.launcher_registry.set_item("force_not_open_workfile", stored) + self.launcher_registry._get_item.cache_clear() + + def is_application_action(self, action): + """Checks if item is of a ApplicationAction type + + Args: + action (action) + """ + if isinstance(action, list) and action: + action = action[0] + + return ApplicationAction in action.__bases__ def is_force_not_open_workfile(self, item, stored): """Checks if application for task is marked to not open workfile @@ -274,10 +286,7 @@ class ActionModel(QtGui.QStandardItemModel): stored (list) of dict """ action = item.data(ACTION_ROLE) - if isinstance(action, list) and action: - action = action[0] - - if ApplicationAction not in action.__bases__: + if not self.is_application_action(action): return False actual_data = self._prepare_compare_data(action) diff --git a/openpype/tools/launcher/widgets.py b/openpype/tools/launcher/widgets.py index 0c21fcb33d..907aff91d4 100644 --- a/openpype/tools/launcher/widgets.py +++ b/openpype/tools/launcher/widgets.py @@ -191,6 +191,9 @@ class ActionBar(QtWidgets.QWidget): return action_item = index.data(ACTION_ROLE) + if not self.model.is_application_action(action_item): + return + menu = QtWidgets.QMenu(self.view) checkbox = QtWidgets.QCheckBox("Force not open last workfile", menu) From 0bb4d317c45fc33072acf4333d670bda000b157a Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 17 Jan 2022 14:55:52 +0100 Subject: [PATCH 058/123] OP-1117 - remove unneeded code --- openpype/tools/launcher/widgets.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/openpype/tools/launcher/widgets.py b/openpype/tools/launcher/widgets.py index 907aff91d4..da9218e4ea 100644 --- a/openpype/tools/launcher/widgets.py +++ b/openpype/tools/launcher/widgets.py @@ -209,11 +209,7 @@ class ActionBar(QtWidgets.QWidget): menu.addAction(action) global_point = self.mapToGlobal(point) - action = menu.exec_(global_point) - if not action or not action.data(): - return - - return + _ = menu.exec_(global_point) def on_checkbox_changed(self, is_checked, action): self.model.update_force_not_open_workfile_settings(is_checked, action) From 276aff358b3c7da0ae9c7e4fa2920f1ee5064004 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 17 Jan 2022 17:03:30 +0100 Subject: [PATCH 059/123] OP-1117 - better handling of setting of start_last_workfile --- openpype/lib/applications.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py index ab20d812e7..772514823e 100644 --- a/openpype/lib/applications.py +++ b/openpype/lib/applications.py @@ -1491,10 +1491,6 @@ def _prepare_last_workfile(data, workdir): log = data["log"] - if not data.get("start_last_workfile", True): - log.info("Explicitly forbidden to open last workfile, skipping") - return - _workdir_data = data.get("workdir_data") if not _workdir_data: log.info( @@ -1511,7 +1507,11 @@ def _prepare_last_workfile(data, workdir): start_last_workfile = should_start_last_workfile( project_name, app.host_name, task_name, task_type ) - data["start_last_workfile"] = start_last_workfile + if not data.get("start_last_workfile", True): + log.info("Explicitly forbidden to open last workfile") + start_last_workfile = False + else: + data["start_last_workfile"] = start_last_workfile workfile_startup = should_workfile_tool_start( project_name, app.host_name, task_name, task_type From 419555ec08b437761f7afc6ac2438f75f7169c7c Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 17 Jan 2022 17:06:26 +0100 Subject: [PATCH 060/123] OP-1117 - handle empty action --- openpype/tools/launcher/models.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/openpype/tools/launcher/models.py b/openpype/tools/launcher/models.py index 86c3d816b2..305707319d 100644 --- a/openpype/tools/launcher/models.py +++ b/openpype/tools/launcher/models.py @@ -300,12 +300,15 @@ class ActionModel(QtGui.QStandardItemModel): if isinstance(action, list) and action: action = action[0] - return { - "app_label": action.label.lower(), - "project_name": self.dbcon.Session["AVALON_PROJECT"], - "asset": self.dbcon.Session["AVALON_ASSET"], - "task_name": self.dbcon.Session["AVALON_TASK"] - } + compare_data = {} + if action: + compare_data = { + "app_label": action.label.lower(), + "project_name": self.dbcon.Session["AVALON_PROJECT"], + "asset": self.dbcon.Session["AVALON_ASSET"], + "task_name": self.dbcon.Session["AVALON_TASK"] + } + return compare_data class ProjectModel(QtGui.QStandardItemModel): From 3e64f2d0ce224af2d3adabb518be4689c2e1e9c8 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 18 Jan 2022 12:41:05 +0100 Subject: [PATCH 061/123] OP-1117 - fixed start_last_workfile logic It wasnt setting this property all the time. --- openpype/lib/applications.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py index 772514823e..152dc6af6b 100644 --- a/openpype/lib/applications.py +++ b/openpype/lib/applications.py @@ -1504,14 +1504,16 @@ def _prepare_last_workfile(data, workdir): project_name = data["project_name"] task_name = data["task_name"] task_type = data["task_type"] - start_last_workfile = should_start_last_workfile( - project_name, app.host_name, task_name, task_type - ) - if not data.get("start_last_workfile", True): - log.info("Explicitly forbidden to open last workfile") - start_last_workfile = False + + start_last_workfile = data.get("start_last_workfile", True) + if start_last_workfile: + start_last_workfile = should_start_last_workfile( + project_name, app.host_name, task_name, task_type + ) else: - data["start_last_workfile"] = start_last_workfile + log.info("Explicitly forbidden to open last workfile") + + data["start_last_workfile"] = start_last_workfile workfile_startup = should_workfile_tool_start( project_name, app.host_name, task_name, task_type From d18ef2c51256413e1ca32bb655463d07dd808782 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Wed, 19 Jan 2022 19:25:11 +0100 Subject: [PATCH 062/123] fix hound --- .../maya/plugins/create/create_unreal_staticmesh.py | 9 ++++++--- openpype/hosts/maya/plugins/publish/clean_nodes.py | 1 - .../plugins/publish/validate_unreal_staticmesh_naming.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py b/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py index 30f024a160..296116caae 100644 --- a/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py +++ b/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Creator for Unreal Static Meshes.""" from openpype.hosts.maya.api import plugin, lib -from avalon.api import CreatorError, Session +from avalon.api import Session from openpype.api import get_project_settings from maya import cmds # noqa @@ -38,5 +38,8 @@ class CreateUnrealStaticMesh(plugin.Creator): geometry = cmds.sets(name="geometry_SET", empty=True) collisions = cmds.sets(name="collisions_SET", empty=True) cmds.sets([geometry, collisions], forceElement=instance) - # todo: Iterate over collision prefixes and add them to correct - # sets. Put rest to the geometry set. + for node in content: + if [n for n in self.collision_prefixes if node.startswith(n)]: + cmds.sets(node, forceElement=collisions) + else: + cmds.sets(node, forceElement=geometry) diff --git a/openpype/hosts/maya/plugins/publish/clean_nodes.py b/openpype/hosts/maya/plugins/publish/clean_nodes.py index e6667b7036..cd3613cc4f 100644 --- a/openpype/hosts/maya/plugins/publish/clean_nodes.py +++ b/openpype/hosts/maya/plugins/publish/clean_nodes.py @@ -24,4 +24,3 @@ class CleanNodesUp(pyblish.api.InstancePlugin): self.log.info("Removing {} nodes".format(len(nodes_to_clean))) for node in nodes_to_clean: cmds.remove(node) - \ No newline at end of file diff --git a/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py b/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py index e7df7c8cbb..c5aa14ec0c 100644 --- a/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py +++ b/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py @@ -118,4 +118,4 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin): invalid = self.get_invalid(instance) if invalid: - raise RuntimeError("Model naming is invalid. See log.") \ No newline at end of file + raise RuntimeError("Model naming is invalid. See log.") From eca0e02a91ba4c2b02c417191b22d179e6681870 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Thu, 20 Jan 2022 01:26:02 +0100 Subject: [PATCH 063/123] create duplicates --- .../create/create_unreal_staticmesh.py | 26 ++++++--- .../hosts/maya/plugins/publish/clean_nodes.py | 11 +++- .../publish/collect_unreal_staticmesh.py | 2 +- .../publish/extract_unreal_staticmesh.py | 23 ++++++-- .../plugins/publish/validate_assembly_name.py | 2 +- .../validate_unreal_staticmesh_naming.py | 55 +++++++++++++------ openpype/plugins/publish/integrate_new.py | 1 + 7 files changed, 86 insertions(+), 34 deletions(-) diff --git a/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py b/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py index 296116caae..d69cc6f0a1 100644 --- a/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py +++ b/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py @@ -35,11 +35,21 @@ class CreateUnrealStaticMesh(plugin.Creator): with lib.undo_chunk(): instance = super(CreateUnrealStaticMesh, self).process() content = cmds.sets(instance, query=True) - geometry = cmds.sets(name="geometry_SET", empty=True) - collisions = cmds.sets(name="collisions_SET", empty=True) - cmds.sets([geometry, collisions], forceElement=instance) - for node in content: - if [n for n in self.collision_prefixes if node.startswith(n)]: - cmds.sets(node, forceElement=collisions) - else: - cmds.sets(node, forceElement=geometry) + + # empty set and process its former content + cmds.sets(content, rm=instance) + geometry_set = cmds.sets(name="geometry_SET", empty=True) + collisions_set = cmds.sets(name="collisions_SET", empty=True) + + cmds.sets([geometry_set, collisions_set], forceElement=instance) + + members = cmds.ls(content, long=True) or [] + children = cmds.listRelatives(members, allDescendents=True, + fullPath=True) or [] + children = cmds.ls(children, type="transform") + for node in children: + if cmds.listRelatives(node, type="shape"): + if [n for n in self.collision_prefixes if node.startswith(n)]: + cmds.sets(node, forceElement=collisions_set) + else: + cmds.sets(node, forceElement=geometry_set) diff --git a/openpype/hosts/maya/plugins/publish/clean_nodes.py b/openpype/hosts/maya/plugins/publish/clean_nodes.py index cd3613cc4f..03995cdabe 100644 --- a/openpype/hosts/maya/plugins/publish/clean_nodes.py +++ b/openpype/hosts/maya/plugins/publish/clean_nodes.py @@ -18,9 +18,14 @@ class CleanNodesUp(pyblish.api.InstancePlugin): def process(self, instance): if not instance.data.get("cleanNodes"): - self.log.info("nothing to clean") + self.log.info("Nothing to clean.") + return - nodes_to_clean = instance.data.pop("cleanNodes") + nodes_to_clean = instance.data.pop("cleanNodes", []) self.log.info("Removing {} nodes".format(len(nodes_to_clean))) for node in nodes_to_clean: - cmds.remove(node) + try: + cmds.delete(node) + except ValueError: + # object might be already deleted, don't complain about it + pass diff --git a/openpype/hosts/maya/plugins/publish/collect_unreal_staticmesh.py b/openpype/hosts/maya/plugins/publish/collect_unreal_staticmesh.py index ad6398041b..b1fb0542f2 100644 --- a/openpype/hosts/maya/plugins/publish/collect_unreal_staticmesh.py +++ b/openpype/hosts/maya/plugins/publish/collect_unreal_staticmesh.py @@ -19,7 +19,7 @@ class CollectUnrealStaticMesh(pyblish.api.InstancePlugin): # add fbx family to trigger fbx extractor instance.data["families"].append("fbx") # take the name from instance (without the `S_` prefix) - instance.data["staticMeshCombinedName"] = instance.name[1:] + instance.data["staticMeshCombinedName"] = instance.name[2:] geometry_set = [i for i in instance if i == "geometry_SET"] instance.data["membersToCombine"] = cmds.sets( diff --git a/openpype/hosts/maya/plugins/publish/extract_unreal_staticmesh.py b/openpype/hosts/maya/plugins/publish/extract_unreal_staticmesh.py index fd9cf69612..7867952de6 100644 --- a/openpype/hosts/maya/plugins/publish/extract_unreal_staticmesh.py +++ b/openpype/hosts/maya/plugins/publish/extract_unreal_staticmesh.py @@ -3,6 +3,7 @@ import openpype.api import pyblish.api from maya import cmds # noqa +from uuid import uuid4 class ExtractUnrealStaticMesh(openpype.api.Extractor): @@ -16,13 +17,27 @@ class ExtractUnrealStaticMesh(openpype.api.Extractor): to_combine = instance.data.get("membersToCombine") static_mesh_name = instance.data.get("staticMeshCombinedName") self.log.info( - "merging {] into {}".format( - "+ ".join(to_combine), static_mesh_name)) + "merging {} into {}".format( + " + ".join(to_combine), static_mesh_name)) + duplicates = cmds.duplicate(to_combine, ic=True) cmds.polyUnite( - *to_combine, - n=static_mesh_name) + *duplicates, + n=static_mesh_name, ch=False) + + collision_duplicates = cmds.duplicate( + instance.data.get("collisionMembers"), ic=True) + cmds.parent(collision_duplicates, a=True, w=True) + instance.data["collisionMembers"] = collision_duplicates + + self.log.info( + "collision members: {}".format(instance.data["collisionMembers"])) if not instance.data.get("cleanNodes"): instance.data["cleanNodes"] = [] instance.data["cleanNodes"].append(static_mesh_name) + instance.data["cleanNodes"] += duplicates + instance.data["cleanNodes"] += collision_duplicates + + instance.data["setMembers"] = [static_mesh_name] + instance.data["setMembers"] += instance.data["collisionMembers"] diff --git a/openpype/hosts/maya/plugins/publish/validate_assembly_name.py b/openpype/hosts/maya/plugins/publish/validate_assembly_name.py index 8f7a3dfaf9..41349553fc 100644 --- a/openpype/hosts/maya/plugins/publish/validate_assembly_name.py +++ b/openpype/hosts/maya/plugins/publish/validate_assembly_name.py @@ -30,7 +30,7 @@ class ValidateAssemblyName(pyblish.api.InstancePlugin): descendants = cmds.listRelatives(content_instance, allDescendents=True, fullPath=True) or [] - descendants = cmds.ls(descendants, noIntermediate=True, long=True) + descendants = cmds.ls(descendants, noIntermediate=True, type="transform") content_instance = list(set(content_instance + descendants)) assemblies = cmds.ls(content_instance, assemblies=True, long=True) diff --git a/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py b/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py index c5aa14ec0c..901a2ec75e 100644 --- a/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py +++ b/openpype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py @@ -4,6 +4,8 @@ from maya import cmds # noqa import pyblish.api import openpype.api import openpype.hosts.maya.api.action +from avalon.api import Session +from openpype.api import get_project_settings import re @@ -15,14 +17,14 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin): in Settings UI. This plugin also validates other types of meshes - collision meshes: - UBX_[RenderMeshName]_##: + UBX_[RenderMeshName]*: Boxes are created with the Box objects type in Max or with the Cube polygonal primitive in Maya. You cannot move the vertices around or deform it in any way to make it something other than a rectangular prism, or else it will not work. - UCP_[RenderMeshName]_##: + UCP_[RenderMeshName]*: Capsules are created with the Capsule object type. The capsule does not need to have many segments (8 is a good number) at all because it is @@ -30,7 +32,7 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin): boxes, you should not move the individual vertices around. - USP_[RenderMeshName]_##: + USP_[RenderMeshName]*: Spheres are created with the Sphere object type. The sphere does not need to have many segments (8 is a good number) at all because it is @@ -38,7 +40,7 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin): boxes, you should not move the individual vertices around. - UCX_[RenderMeshName]_##: + UCX_[RenderMeshName]*: Convex objects can be any completely closed convex 3D shape. For example, a box can also be a convex object @@ -53,14 +55,23 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin): families = ["unrealStaticMesh"] label = "Unreal StaticMesh Name" actions = [openpype.hosts.maya.api.action.SelectInvalidAction] - regex_mesh = r"(?P.*)_(\d{2})" - regex_collision = r"_(?P.*)_(\d{2})" + regex_mesh = r"(?P.*))" + regex_collision = r"(?P.*)" @classmethod def get_invalid(cls, instance): invalid = [] + project_settings = get_project_settings(Session["AVALON_PROJECT"]) + collision_prefixes = ( + project_settings + ["maya"] + ["create"] + ["CreateUnrealStaticMesh"] + ["collision_prefixes"] + ) + combined_geometry_name = instance.data.get( "staticMeshCombinedName", None) if cls.validate_mesh: @@ -81,10 +92,11 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin): return False regex_collision = "{}{}".format( - "({})_".format( - "|".join("(0}".format(p) for p in cls.collision_prefixes) + "(?P({}))_".format( + "|".join("{0}".format(p) for p in collision_prefixes) ) or "", cls.regex_collision ) + cl_r = re.compile(regex_collision) for obj in collision_set: @@ -92,20 +104,29 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin): if not cl_m: cls.log.error("{} is invalid".format(obj)) invalid.append(obj) - elif cl_m.group("renderName") != combined_geometry_name: - cls.log.error( - "Collision object name doesn't match" - "static mesh name: {} != {}".format( - cl_m.group("renderName"), - combined_geometry_name) + else: + expected_collision = "{}_{}".format( + cl_m.group("prefix"), + combined_geometry_name ) - invalid.append(obj) + + if not obj.startswith(expected_collision): + + cls.log.error( + "Collision object name doesn't match " + "static mesh name" + ) + cls.log.error("{}_{} != {}_{}".format( + cl_m.group("prefix"), + cl_m.group("renderName"), + cl_m.group("prefix"), + combined_geometry_name, + )) + invalid.append(obj) return invalid def process(self, instance): - # todo: load prefixes from creator settings. - if not self.validate_mesh and not self.validate_collision: self.log.info("Validation of both mesh and collision names" "is disabled.") diff --git a/openpype/plugins/publish/integrate_new.py b/openpype/plugins/publish/integrate_new.py index cec2e470b3..bf214d9139 100644 --- a/openpype/plugins/publish/integrate_new.py +++ b/openpype/plugins/publish/integrate_new.py @@ -389,6 +389,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): repre["ext"] = ext template_data["ext"] = ext + self.log.info(template_name) template = os.path.normpath( anatomy.templates[template_name]["path"]) From 650294b65657d7bbfa5b28b3bbcd2265e44926ce Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 20 Jan 2022 12:30:06 +0100 Subject: [PATCH 064/123] OP-1117 - fix for Adobe products --- openpype/hooks/pre_add_last_workfile_arg.py | 4 +++- openpype/hooks/pre_global_host_data.py | 2 +- openpype/hooks/pre_non_python_host_launch.py | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/openpype/hooks/pre_add_last_workfile_arg.py b/openpype/hooks/pre_add_last_workfile_arg.py index 5ca2a42510..4ff5e17edc 100644 --- a/openpype/hooks/pre_add_last_workfile_arg.py +++ b/openpype/hooks/pre_add_last_workfile_arg.py @@ -6,6 +6,8 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook): """Add last workfile path to launch arguments. This is not possible to do for all applications the same way. + Checks 'start_last_workfile', if set to False, it will not open last + wokfile. This property is set explicitly in Launcher. """ # Execute after workfile template copy @@ -23,7 +25,7 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook): ] def execute(self): - if not self.data.get("start_last_workfile"): + if not self.data.get("start_last_workfile", True): self.log.info("It is set to not start last workfile on start.") return diff --git a/openpype/hooks/pre_global_host_data.py b/openpype/hooks/pre_global_host_data.py index bae967e25f..3f56c47a42 100644 --- a/openpype/hooks/pre_global_host_data.py +++ b/openpype/hooks/pre_global_host_data.py @@ -43,7 +43,7 @@ class GlobalHostDataHook(PreLaunchHook): "env": self.launch_context.env, - "start_last_workfile": self.data.get("start_last_workfile"), + "start_last_workfile": self.data.get("start_last_workfile", True), "last_workfile_path": self.data.get("last_workfile_path"), "log": self.log diff --git a/openpype/hooks/pre_non_python_host_launch.py b/openpype/hooks/pre_non_python_host_launch.py index 8aa61a9027..5bbc0a4834 100644 --- a/openpype/hooks/pre_non_python_host_launch.py +++ b/openpype/hooks/pre_non_python_host_launch.py @@ -40,7 +40,10 @@ class NonPythonHostHook(PreLaunchHook): ) # Add workfile path if exists workfile_path = self.data["last_workfile_path"] - if workfile_path and os.path.exists(workfile_path): + if ( + self.data.get("start_last_workfile", True) + and workfile_path + and os.path.exists(workfile_path)): new_launch_args.append(workfile_path) # Append as whole list as these areguments should not be separated From f6ccc6aee10360a88ea0bba1b66ecce3b8958dd0 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 20 Jan 2022 14:51:14 +0100 Subject: [PATCH 065/123] OP-1117 - updated setting of state on action item Updated handling of menu display and repaint --- openpype/tools/launcher/constants.py | 1 + openpype/tools/launcher/models.py | 26 +++++++++++++++++++------- openpype/tools/launcher/widgets.py | 26 +++++++++++++++++++++----- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/openpype/tools/launcher/constants.py b/openpype/tools/launcher/constants.py index 3747b0f0a4..61f631759b 100644 --- a/openpype/tools/launcher/constants.py +++ b/openpype/tools/launcher/constants.py @@ -8,6 +8,7 @@ ACTION_ID_ROLE = QtCore.Qt.UserRole + 3 ANIMATION_START_ROLE = QtCore.Qt.UserRole + 4 ANIMATION_STATE_ROLE = QtCore.Qt.UserRole + 5 FORCE_NOT_OPEN_WORKFILE_ROLE = QtCore.Qt.UserRole + 6 +ACTION_TOOLTIP_ROLE = QtCore.Qt.UserRole + 7 # Animation length in seconds ANIMATION_LEN = 7 diff --git a/openpype/tools/launcher/models.py b/openpype/tools/launcher/models.py index 305707319d..10922e42cc 100644 --- a/openpype/tools/launcher/models.py +++ b/openpype/tools/launcher/models.py @@ -32,7 +32,7 @@ class ActionModel(QtGui.QStandardItemModel): # Cache of available actions self._registered_actions = list() self.items_by_id = {} - path = appdirs.user_data_dir("openpype", "pype_club") + path = appdirs.user_data_dir("openpype", "pypeclub") self.launcher_registry = JSONSettingRegistry("launcher", path) try: @@ -198,10 +198,7 @@ class ActionModel(QtGui.QStandardItemModel): if self.is_force_not_open_workfile(item, stored): - label = item.text() - label += " (Not opening last workfile)" - item.setData(label, QtCore.Qt.ToolTipRole) - item.setData(True, FORCE_NOT_OPEN_WORKFILE_ROLE) + self.change_action_item(item, True) self.items_by_id[item_id] = item items.append(item) @@ -241,13 +238,18 @@ class ActionModel(QtGui.QStandardItemModel): key=lambda action: (action.order, action.name) ) - def update_force_not_open_workfile_settings(self, is_checked, action): + def update_force_not_open_workfile_settings(self, is_checked, action_id): """Store/remove config for forcing to skip opening last workfile. Args: is_checked (bool): True to add, False to remove - action (ApplicationAction) + action_id (str) """ + action_item = self.items_by_id.get(action_id) + if not action_item: + return + + action = action_item.data(ACTION_ROLE) actual_data = self._prepare_compare_data(action) stored = self.launcher_registry.get_item("force_not_open_workfile") @@ -262,6 +264,16 @@ class ActionModel(QtGui.QStandardItemModel): self.launcher_registry.set_item("force_not_open_workfile", stored) self.launcher_registry._get_item.cache_clear() + self.change_action_item(action_item, is_checked) + + def change_action_item(self, item, checked): + """Modifies tooltip and sets if opening of last workfile forbidden""" + tooltip = item.data(QtCore.Qt.ToolTipRole) + if checked: + tooltip += " (Not opening last workfile)" + + item.setData(tooltip, QtCore.Qt.ToolTipRole) + item.setData(checked, FORCE_NOT_OPEN_WORKFILE_ROLE) def is_application_action(self, action): """Checks if item is of a ApplicationAction type diff --git a/openpype/tools/launcher/widgets.py b/openpype/tools/launcher/widgets.py index da9218e4ea..ae95e2e8d8 100644 --- a/openpype/tools/launcher/widgets.py +++ b/openpype/tools/launcher/widgets.py @@ -139,7 +139,14 @@ class ActionBar(QtWidgets.QWidget): view.clicked.connect(self.on_clicked) view.customContextMenuRequested.connect(self.on_context_menu) + self._context_menu = None + self._discover_on_menu = False + def discover_actions(self): + if self._context_menu is not None: + self._discover_on_menu = True + return + if self._animation_timer.isActive(): self._animation_timer.stop() self.model.discover() @@ -200,20 +207,29 @@ class ActionBar(QtWidgets.QWidget): if index.data(FORCE_NOT_OPEN_WORKFILE_ROLE): checkbox.setChecked(True) + action_id = index.data(ACTION_ID_ROLE) checkbox.stateChanged.connect( lambda: self.on_checkbox_changed(checkbox.isChecked(), - action_item)) + action_id)) action = QtWidgets.QWidgetAction(menu) action.setDefaultWidget(checkbox) menu.addAction(action) + self._context_menu = menu global_point = self.mapToGlobal(point) - _ = menu.exec_(global_point) + menu.exec_(global_point) + self._context_menu = None + if self._discover_on_menu: + self._discover_on_menu = False + self.discover_actions() - def on_checkbox_changed(self, is_checked, action): - self.model.update_force_not_open_workfile_settings(is_checked, action) - self.discover_actions() # repaint + def on_checkbox_changed(self, is_checked, action_id): + self.model.update_force_not_open_workfile_settings(is_checked, + action_id) + self.view.update() + if self._context_menu is not None: + self._context_menu.close() def on_clicked(self, index): if not index or not index.isValid(): From 47244a39176b1ea6371aaec05de4663cd1727977 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Thu, 20 Jan 2022 17:13:21 +0100 Subject: [PATCH 066/123] create duplicates --- openpype/hosts/maya/api/lib.py | 25 +++++++++++++++++++ .../hosts/maya/plugins/publish/extract_fbx.py | 24 +++++++++++------- .../publish/extract_unreal_staticmesh.py | 10 -------- 3 files changed, 40 insertions(+), 19 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 3f93bc2ab5..0858c205ea 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -2853,3 +2853,28 @@ def set_colorspace(): cmds.colorManagementPrefs(e=True, renderingSpaceName=renderSpace) viewTransform = root_dict["viewTransform"] cmds.colorManagementPrefs(e=True, viewTransformName=viewTransform) + + +@contextlib.contextmanager +def root_parent(nodes): + # type: (list) -> list + """Context manager to un-parent provided nodes and return then back.""" + import pymel.core as pm # noqa + + node_parents = [] + for node in nodes: + n = pm.PyNode(node) + try: + root = pm.listRelatives(n, parent=1)[0] + except IndexError: + root = None + node_parents.append((n, root)) + try: + for node in node_parents: + node[0].setParent(world=True) + yield + finally: + for node in node_parents: + if node[1]: + node[0].setParent(node[1]) + diff --git a/openpype/hosts/maya/plugins/publish/extract_fbx.py b/openpype/hosts/maya/plugins/publish/extract_fbx.py index 720a61b0a7..e4894f28cd 100644 --- a/openpype/hosts/maya/plugins/publish/extract_fbx.py +++ b/openpype/hosts/maya/plugins/publish/extract_fbx.py @@ -1,7 +1,9 @@ +# -*- coding: utf-8 -*- import os -from maya import cmds -import maya.mel as mel +from maya import cmds # noqa +import maya.mel as mel # noqa +from openpype.hosts.maya.api.lib import root_parent import pyblish.api import avalon.maya @@ -192,10 +194,7 @@ class ExtractFBX(openpype.api.Extractor): if isinstance(value, bool): value = str(value).lower() - template = "FBXExport{0} -v {1}" - if key == "UpAxis": - template = "FBXExport{0} {1}" - + template = "FBXExport{0} {1}" if key == "UpAxis" else "FBXExport{0} -v {1}" # noqa cmd = template.format(key, value) self.log.info(cmd) mel.eval(cmd) @@ -205,9 +204,16 @@ class ExtractFBX(openpype.api.Extractor): mel.eval("FBXExportGenerateLog -v false") # Export - with avalon.maya.maintained_selection(): - cmds.select(members, r=1, noExpand=True) - mel.eval('FBXExport -f "{}" -s'.format(path)) + if "unrealStaticMesh" in instance.data["families"]: + with avalon.maya.maintained_selection(): + with root_parent(members): + self.log.info("Un-parenting: {}".format(members)) + cmds.select(members, r=1, noExpand=True) + mel.eval('FBXExport -f "{}" -s'.format(path)) + else: + with avalon.maya.maintained_selection(): + cmds.select(members, r=1, noExpand=True) + mel.eval('FBXExport -f "{}" -s'.format(path)) if "representations" not in instance.data: instance.data["representations"] = [] diff --git a/openpype/hosts/maya/plugins/publish/extract_unreal_staticmesh.py b/openpype/hosts/maya/plugins/publish/extract_unreal_staticmesh.py index 7867952de6..32dc9d1d1c 100644 --- a/openpype/hosts/maya/plugins/publish/extract_unreal_staticmesh.py +++ b/openpype/hosts/maya/plugins/publish/extract_unreal_staticmesh.py @@ -3,7 +3,6 @@ import openpype.api import pyblish.api from maya import cmds # noqa -from uuid import uuid4 class ExtractUnrealStaticMesh(openpype.api.Extractor): @@ -24,20 +23,11 @@ class ExtractUnrealStaticMesh(openpype.api.Extractor): *duplicates, n=static_mesh_name, ch=False) - collision_duplicates = cmds.duplicate( - instance.data.get("collisionMembers"), ic=True) - cmds.parent(collision_duplicates, a=True, w=True) - instance.data["collisionMembers"] = collision_duplicates - - self.log.info( - "collision members: {}".format(instance.data["collisionMembers"])) - if not instance.data.get("cleanNodes"): instance.data["cleanNodes"] = [] instance.data["cleanNodes"].append(static_mesh_name) instance.data["cleanNodes"] += duplicates - instance.data["cleanNodes"] += collision_duplicates instance.data["setMembers"] = [static_mesh_name] instance.data["setMembers"] += instance.data["collisionMembers"] From c88f95fa6f289b0fef1daaccf79da019eb20417e Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Thu, 20 Jan 2022 17:18:06 +0100 Subject: [PATCH 067/123] =?UTF-8?q?fix=20=F0=9F=90=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openpype/hosts/maya/api/lib.py | 1 - .../hosts/maya/plugins/create/create_unreal_staticmesh.py | 5 ++++- .../hosts/maya/plugins/publish/validate_assembly_name.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py index 0858c205ea..8e50c3c00a 100644 --- a/openpype/hosts/maya/api/lib.py +++ b/openpype/hosts/maya/api/lib.py @@ -2877,4 +2877,3 @@ def root_parent(nodes): for node in node_parents: if node[1]: node[0].setParent(node[1]) - diff --git a/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py b/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py index d69cc6f0a1..9ad560ab7c 100644 --- a/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py +++ b/openpype/hosts/maya/plugins/create/create_unreal_staticmesh.py @@ -49,7 +49,10 @@ class CreateUnrealStaticMesh(plugin.Creator): children = cmds.ls(children, type="transform") for node in children: if cmds.listRelatives(node, type="shape"): - if [n for n in self.collision_prefixes if node.startswith(n)]: + if [ + n for n in self.collision_prefixes + if node.startswith(n) + ]: cmds.sets(node, forceElement=collisions_set) else: cmds.sets(node, forceElement=geometry_set) diff --git a/openpype/hosts/maya/plugins/publish/validate_assembly_name.py b/openpype/hosts/maya/plugins/publish/validate_assembly_name.py index 41349553fc..02464b2302 100644 --- a/openpype/hosts/maya/plugins/publish/validate_assembly_name.py +++ b/openpype/hosts/maya/plugins/publish/validate_assembly_name.py @@ -30,7 +30,8 @@ class ValidateAssemblyName(pyblish.api.InstancePlugin): descendants = cmds.listRelatives(content_instance, allDescendents=True, fullPath=True) or [] - descendants = cmds.ls(descendants, noIntermediate=True, type="transform") + descendants = cmds.ls( + descendants, noIntermediate=True, type="transform") content_instance = list(set(content_instance + descendants)) assemblies = cmds.ls(content_instance, assemblies=True, long=True) From 49babb5f0ebe1248e647ddd9c276e3d72752cb58 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 20 Jan 2022 17:50:54 +0100 Subject: [PATCH 068/123] global: track name was failing if duplicated root word in name --- openpype/plugins/publish/collect_otio_review.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/collect_otio_review.py b/openpype/plugins/publish/collect_otio_review.py index 35c77a24cb..4d8147e70d 100644 --- a/openpype/plugins/publish/collect_otio_review.py +++ b/openpype/plugins/publish/collect_otio_review.py @@ -46,7 +46,7 @@ class CollectOtioReview(pyblish.api.InstancePlugin): # loop all tracks and match with name in `reviewTrack` for track in otio_timeline.tracks: - if review_track_name not in track.name: + if review_track_name != track.name: continue # process correct track From 72170d550aa3b2d25313de36c5759e3dbab37f32 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 21 Jan 2022 01:28:07 +0100 Subject: [PATCH 069/123] moved blender implementation to openpype --- openpype/hosts/blender/__init__.py | 7 +- openpype/hosts/blender/api/__init__.py | 136 +++--- .../hosts/blender/api/icons/pyblish-32x32.png | Bin 0 -> 632 bytes openpype/hosts/blender/api/lib.py | 159 +++++++ openpype/hosts/blender/api/ops.py | 410 +++++++++++++++++ openpype/hosts/blender/api/pipeline.py | 427 ++++++++++++++++++ openpype/hosts/blender/api/plugin.py | 47 +- openpype/hosts/blender/api/workio.py | 90 ++++ .../blender/blender_addon/startup/init.py | 4 + openpype/hosts/blender/plugins/__init__.py | 0 .../hosts/blender/plugins/create/__init__.py | 0 .../blender/plugins/create/create_action.py | 2 +- .../plugins/create/create_animation.py | 5 +- .../blender/plugins/create/create_camera.py | 5 +- .../blender/plugins/create/create_layout.py | 5 +- .../blender/plugins/create/create_model.py | 5 +- .../plugins/create/create_pointcache.py | 2 +- .../blender/plugins/create/create_rig.py | 5 +- .../hosts/blender/plugins/load/__init__.py | 0 .../hosts/blender/plugins/load/load_abc.py | 11 +- .../blender/plugins/load/load_animation.py | 7 +- .../hosts/blender/plugins/load/load_audio.py | 8 +- .../blender/plugins/load/load_camera_blend.py | 8 +- .../blender/plugins/load/load_camera_fbx.py | 11 +- .../hosts/blender/plugins/load/load_fbx.py | 11 +- .../blender/plugins/load/load_layout_blend.py | 8 +- .../blender/plugins/load/load_layout_json.py | 12 +- .../hosts/blender/plugins/load/load_look.py | 16 +- .../hosts/blender/plugins/load/load_model.py | 8 +- .../hosts/blender/plugins/load/load_rig.py | 8 +- .../hosts/blender/plugins/publish/__init__.py | 0 .../plugins/publish/collect_instances.py | 8 +- .../blender/plugins/publish/extract_abc.py | 6 +- .../blender/plugins/publish/extract_blend.py | 1 - .../blender/plugins/publish/extract_camera.py | 4 +- .../blender/plugins/publish/extract_fbx.py | 6 +- .../plugins/publish/extract_fbx_animation.py | 2 +- .../blender/plugins/publish/extract_layout.py | 2 +- .../publish/increment_workfile_version.py | 4 +- openpype/hosts/blender/startup/init.py | 3 - 40 files changed, 1270 insertions(+), 183 deletions(-) create mode 100644 openpype/hosts/blender/api/icons/pyblish-32x32.png create mode 100644 openpype/hosts/blender/api/ops.py create mode 100644 openpype/hosts/blender/api/pipeline.py create mode 100644 openpype/hosts/blender/api/workio.py create mode 100644 openpype/hosts/blender/blender_addon/startup/init.py delete mode 100644 openpype/hosts/blender/plugins/__init__.py delete mode 100644 openpype/hosts/blender/plugins/create/__init__.py delete mode 100644 openpype/hosts/blender/plugins/load/__init__.py delete mode 100644 openpype/hosts/blender/plugins/publish/__init__.py delete mode 100644 openpype/hosts/blender/startup/init.py diff --git a/openpype/hosts/blender/__init__.py b/openpype/hosts/blender/__init__.py index 747394aad0..3081d3c9ba 100644 --- a/openpype/hosts/blender/__init__.py +++ b/openpype/hosts/blender/__init__.py @@ -5,11 +5,8 @@ def add_implementation_envs(env, _app): """Modify environments to contain all required for implementation.""" # Prepare path to implementation script implementation_user_script_path = os.path.join( - os.environ["OPENPYPE_REPOS_ROOT"], - "repos", - "avalon-core", - "setup", - "blender" + os.path.dirname(os.path.abspath(__file__)), + "blender_addon" ) # Add blender implementation script path to PYTHONPATH diff --git a/openpype/hosts/blender/api/__init__.py b/openpype/hosts/blender/api/__init__.py index ecf4fdf4da..e017d74d91 100644 --- a/openpype/hosts/blender/api/__init__.py +++ b/openpype/hosts/blender/api/__init__.py @@ -1,94 +1,64 @@ -import os -import sys -import traceback +"""Public API -import bpy +Anything that isn't defined here is INTERNAL and unreliable for external use. -from .lib import append_user_scripts +""" -from avalon import api as avalon -from pyblish import api as pyblish +from .pipeline import ( + install, + uninstall, + ls, + publish, + containerise, +) -import openpype.hosts.blender +from .plugin import ( + Creator, + Loader, +) -HOST_DIR = os.path.dirname(os.path.abspath(openpype.hosts.blender.__file__)) -PLUGINS_DIR = os.path.join(HOST_DIR, "plugins") -PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") -LOAD_PATH = os.path.join(PLUGINS_DIR, "load") -CREATE_PATH = os.path.join(PLUGINS_DIR, "create") -INVENTORY_PATH = os.path.join(PLUGINS_DIR, "inventory") +from .workio import ( + open_file, + save_file, + current_file, + has_unsaved_changes, + file_extensions, + work_root, +) -ORIGINAL_EXCEPTHOOK = sys.excepthook +from .lib import ( + lsattr, + lsattrs, + read, + maintained_selection, + get_selection, + # unique_name, +) -def pype_excepthook_handler(*args): - traceback.print_exception(*args) +__all__ = [ + "install", + "uninstall", + "ls", + "publish", + "containerise", + "Creator", + "Loader", -def install(): - """Install Blender configuration for Avalon.""" - sys.excepthook = pype_excepthook_handler - pyblish.register_plugin_path(str(PUBLISH_PATH)) - avalon.register_plugin_path(avalon.Loader, str(LOAD_PATH)) - avalon.register_plugin_path(avalon.Creator, str(CREATE_PATH)) - append_user_scripts() - avalon.on("new", on_new) - avalon.on("open", on_open) + # Workfiles API + "open_file", + "save_file", + "current_file", + "has_unsaved_changes", + "file_extensions", + "work_root", - -def uninstall(): - """Uninstall Blender configuration for Avalon.""" - sys.excepthook = ORIGINAL_EXCEPTHOOK - pyblish.deregister_plugin_path(str(PUBLISH_PATH)) - avalon.deregister_plugin_path(avalon.Loader, str(LOAD_PATH)) - avalon.deregister_plugin_path(avalon.Creator, str(CREATE_PATH)) - - -def set_start_end_frames(): - from avalon import io - - asset_name = io.Session["AVALON_ASSET"] - asset_doc = io.find_one({ - "type": "asset", - "name": asset_name - }) - - scene = bpy.context.scene - - # Default scene settings - frameStart = scene.frame_start - frameEnd = scene.frame_end - fps = scene.render.fps - resolution_x = scene.render.resolution_x - resolution_y = scene.render.resolution_y - - # Check if settings are set - data = asset_doc.get("data") - - if not data: - return - - if data.get("frameStart"): - frameStart = data.get("frameStart") - if data.get("frameEnd"): - frameEnd = data.get("frameEnd") - if data.get("fps"): - fps = data.get("fps") - if data.get("resolutionWidth"): - resolution_x = data.get("resolutionWidth") - if data.get("resolutionHeight"): - resolution_y = data.get("resolutionHeight") - - scene.frame_start = frameStart - scene.frame_end = frameEnd - scene.render.fps = fps - scene.render.resolution_x = resolution_x - scene.render.resolution_y = resolution_y - - -def on_new(arg1, arg2): - set_start_end_frames() - - -def on_open(arg1, arg2): - set_start_end_frames() + # Utility functions + "maintained_selection", + "lsattr", + "lsattrs", + "read", + "get_selection", + # "unique_name", +] diff --git a/openpype/hosts/blender/api/icons/pyblish-32x32.png b/openpype/hosts/blender/api/icons/pyblish-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..b34e397e0bd502eb336f994f014a518198d93599 GIT binary patch literal 632 zcmV-;0*C#HP)?m3OVFzoDHzW14L zXLc9IkqG*a3_I>wqC(4bTV70aHK&_zb)S-or zdR!e?Gz01oa2+_3G`|NP#ua@8z5!o>X<#;9R|2bmL0|;f63ZT7V-l+d919^l%3Ar^ zg#3!SwovNY$J`#X`Bzud{=Sy+^`w3nIH_(b$uI|`d*DIZ+4=~EfmcB5%AW!Efyc4_ z377pl-+RGsR;{ENE2 zlz9SiqM-S_dY}^X1mao&fb*4_M}R@~`4Y_Us>><|h!DGM9;+<*qLEA%q6-GNXH<>i|*pjP~hX0nBH#FZ2qakcE>` z0W5F17Z?vA{OT}XF{!tbqt{SR^~5*hEygi&)Nu5GKn2{MR3FJp2!~ Sv8(t10000>> import bpy + >>> def compute(): + ... return 6 + ... + >>> bpy.ops.mesh.primitive_cube_add() + >>> cube = bpy.context.view_layer.objects.active + >>> imprint(cube, { + ... "regularString": "myFamily", + ... "computedValue": lambda: compute() + ... }) + ... + >>> cube['avalon']['computedValue'] + 6 + """ + + imprint_data = dict() + + for key, value in data.items(): + if value is None: + continue + + if callable(value): + # Support values evaluated at imprint + value = value() + + if not isinstance(value, (int, float, bool, str, list)): + raise TypeError(f"Unsupported type: {type(value)}") + + imprint_data[key] = value + + pipeline.metadata_update(node, imprint_data) + + +def lsattr(attr: str, + value: Union[str, int, bool, List, Dict, None] = None) -> List: + r"""Return nodes matching `attr` and `value` + + Arguments: + attr: Name of Blender property + value: Value of attribute. If none + is provided, return all nodes with this attribute. + + Example: + >>> lsattr("id", "myId") + ... [bpy.data.objects["myNode"] + >>> lsattr("id") + ... [bpy.data.objects["myNode"], bpy.data.objects["myOtherNode"]] + + Returns: + list + """ + + return lsattrs({attr: value}) + + +def lsattrs(attrs: Dict) -> List: + r"""Return nodes with the given attribute(s). + + Arguments: + attrs: Name and value pairs of expected matches + + Example: + >>> lsattrs({"age": 5}) # Return nodes with an `age` of 5 + # Return nodes with both `age` and `color` of 5 and blue + >>> lsattrs({"age": 5, "color": "blue"}) + + Returns a list. + + """ + + # For now return all objects, not filtered by scene/collection/view_layer. + matches = set() + for coll in dir(bpy.data): + if not isinstance( + getattr(bpy.data, coll), + bpy.types.bpy_prop_collection, + ): + continue + for node in getattr(bpy.data, coll): + for attr, value in attrs.items(): + avalon_prop = node.get(pipeline.AVALON_PROPERTY) + if not avalon_prop: + continue + if (avalon_prop.get(attr) + and (value is None or avalon_prop.get(attr) == value)): + matches.add(node) + return list(matches) + + +def read(node: bpy.types.bpy_struct_meta_idprop): + """Return user-defined attributes from `node`""" + + data = dict(node.get(pipeline.AVALON_PROPERTY)) + + # Ignore hidden/internal data + data = { + key: value + for key, value in data.items() if not key.startswith("_") + } + + return data + + +def get_selection() -> List[bpy.types.Object]: + """Return the selected objects from the current scene.""" + return [obj for obj in bpy.context.scene.objects if obj.select_get()] + + +@contextlib.contextmanager +def maintained_selection(): + r"""Maintain selection during context + + Example: + >>> with maintained_selection(): + ... # Modify selection + ... bpy.ops.object.select_all(action='DESELECT') + >>> # Selection restored + """ + + previous_selection = get_selection() + previous_active = bpy.context.view_layer.objects.active + try: + yield + finally: + # Clear the selection + for node in get_selection(): + node.select_set(state=False) + if previous_selection: + for node in previous_selection: + try: + node.select_set(state=True) + except ReferenceError: + # This could happen if a selected node was deleted during + # the context. + log.exception("Failed to reselect") + continue + try: + bpy.context.view_layer.objects.active = previous_active + except ReferenceError: + # This could happen if the active node was deleted during the + # context. + log.exception("Failed to set active object.") diff --git a/openpype/hosts/blender/api/ops.py b/openpype/hosts/blender/api/ops.py new file mode 100644 index 0000000000..a73ef0133a --- /dev/null +++ b/openpype/hosts/blender/api/ops.py @@ -0,0 +1,410 @@ +"""Blender operators and menus for use with Avalon.""" + +import os +import sys +import platform +import time +import traceback +import collections +from pathlib import Path +from types import ModuleType +from typing import Dict, List, Optional, Union + +from Qt import QtWidgets, QtCore + +import bpy +import bpy.utils.previews + +import avalon.api +from openpype.tools.utils import host_tools +from openpype import style + +from .workio import OpenFileCacher + +PREVIEW_COLLECTIONS: Dict = dict() + +# This seems like a good value to keep the Qt app responsive and doesn't slow +# down Blender. At least on macOS I the interace of Blender gets very laggy if +# you make it smaller. +TIMER_INTERVAL: float = 0.01 + + +class BlenderApplication(QtWidgets.QApplication): + _instance = None + blender_windows = {} + + def __init__(self, *args, **kwargs): + super(BlenderApplication, self).__init__(*args, **kwargs) + self.setQuitOnLastWindowClosed(False) + + self.setStyleSheet(style.load_stylesheet()) + self.lastWindowClosed.connect(self.__class__.reset) + + @classmethod + def get_app(cls): + if cls._instance is None: + cls._instance = cls(sys.argv) + return cls._instance + + @classmethod + def reset(cls): + cls._instance = None + + @classmethod + def store_window(cls, identifier, window): + current_window = cls.get_window(identifier) + cls.blender_windows[identifier] = window + if current_window: + current_window.close() + # current_window.deleteLater() + + @classmethod + def get_window(cls, identifier): + return cls.blender_windows.get(identifier) + + +class MainThreadItem: + """Structure to store information about callback in main thread. + + Item should be used to execute callback in main thread which may be needed + for execution of Qt objects. + + Item store callback (callable variable), arguments and keyword arguments + for the callback. Item hold information about it's process. + """ + not_set = object() + sleep_time = 0.1 + + def __init__(self, callback, *args, **kwargs): + self.done = False + self.exception = self.not_set + self.result = self.not_set + self.callback = callback + self.args = args + self.kwargs = kwargs + + def execute(self): + """Execute callback and store it's result. + + Method must be called from main thread. Item is marked as `done` + when callback execution finished. Store output of callback of exception + information when callback raise one. + """ + print("Executing process in main thread") + if self.done: + print("- item is already processed") + return + + callback = self.callback + args = self.args + kwargs = self.kwargs + print("Running callback: {}".format(str(callback))) + try: + result = callback(*args, **kwargs) + self.result = result + + except Exception: + self.exception = sys.exc_info() + + finally: + print("Done") + self.done = True + + def wait(self): + """Wait for result from main thread. + + This method stops current thread until callback is executed. + + Returns: + object: Output of callback. May be any type or object. + + Raises: + Exception: Reraise any exception that happened during callback + execution. + """ + while not self.done: + print(self.done) + time.sleep(self.sleep_time) + + if self.exception is self.not_set: + return self.result + raise self.exception + + +class GlobalClass: + app = None + main_thread_callbacks = collections.deque() + is_windows = platform.system().lower() == "windows" + + +def execute_in_main_thread(main_thead_item): + print("execute_in_main_thread") + GlobalClass.main_thread_callbacks.append(main_thead_item) + + +def _process_app_events() -> Optional[float]: + """Process the events of the Qt app if the window is still visible. + + If the app has any top level windows and at least one of them is visible + return the time after which this function should be run again. Else return + None, so the function is not run again and will be unregistered. + """ + while GlobalClass.main_thread_callbacks: + main_thread_item = GlobalClass.main_thread_callbacks.popleft() + main_thread_item.execute() + if main_thread_item.exception is not MainThreadItem.not_set: + _clc, val, tb = main_thread_item.exception + msg = str(val) + detail = "\n".join(traceback.format_exception(_clc, val, tb)) + dialog = QtWidgets.QMessageBox( + QtWidgets.QMessageBox.Warning, + "Error", + msg) + dialog.setMinimumWidth(500) + dialog.setDetailedText(detail) + dialog.exec_() + + if not GlobalClass.is_windows: + if OpenFileCacher.opening_file: + return TIMER_INTERVAL + + app = GlobalClass.app + if app._instance: + app.processEvents() + return TIMER_INTERVAL + return TIMER_INTERVAL + + +class LaunchQtApp(bpy.types.Operator): + """A Base class for opertors to launch a Qt app.""" + + _app: QtWidgets.QApplication + _window = Union[QtWidgets.QDialog, ModuleType] + _tool_name: str = None + _init_args: Optional[List] = list() + _init_kwargs: Optional[Dict] = dict() + bl_idname: str = None + + def __init__(self): + if self.bl_idname is None: + raise NotImplementedError("Attribute `bl_idname` must be set!") + print(f"Initialising {self.bl_idname}...") + self._app = BlenderApplication.get_app() + GlobalClass.app = self._app + + bpy.app.timers.register( + _process_app_events, + persistent=True + ) + + def execute(self, context): + """Execute the operator. + + The child class must implement `execute()` where it only has to set + `self._window` to the desired Qt window and then simply run + `return super().execute(context)`. + `self._window` is expected to have a `show` method. + If the `show` method requires arguments, you can set `self._show_args` + and `self._show_kwargs`. `args` should be a list, `kwargs` a + dictionary. + """ + + if self._tool_name is None: + if self._window is None: + raise AttributeError("`self._window` is not set.") + + else: + window = self._app.get_window(self.bl_idname) + if window is None: + window = host_tools.get_tool_by_name(self._tool_name) + self._app.store_window(self.bl_idname, window) + self._window = window + + if not isinstance( + self._window, + (QtWidgets.QMainWindow, QtWidgets.QDialog, ModuleType) + ): + raise AttributeError( + "`window` should be a `QDialog or module`. Got: {}".format( + str(type(window)) + ) + ) + + self.before_window_show() + + if isinstance(self._window, ModuleType): + self._window.show() + window = None + if hasattr(self._window, "window"): + window = self._window.window + elif hasattr(self._window, "_window"): + window = self._window.window + + if window: + self._app.store_window(self.bl_idname, window) + + else: + origin_flags = self._window.windowFlags() + on_top_flags = origin_flags | QtCore.Qt.WindowStaysOnTopHint + self._window.setWindowFlags(on_top_flags) + self._window.show() + + if on_top_flags != origin_flags: + self._window.setWindowFlags(origin_flags) + self._window.show() + + return {'FINISHED'} + + def before_window_show(self): + return + + +class LaunchCreator(LaunchQtApp): + """Launch Avalon Creator.""" + + bl_idname = "wm.avalon_creator" + bl_label = "Create..." + _tool_name = "creator" + + def before_window_show(self): + self._window.refresh() + + +class LaunchLoader(LaunchQtApp): + """Launch Avalon Loader.""" + + bl_idname = "wm.avalon_loader" + bl_label = "Load..." + _tool_name = "loader" + + def before_window_show(self): + self._window.set_context( + {"asset": avalon.api.Session["AVALON_ASSET"]}, + refresh=True + ) + + +class LaunchPublisher(LaunchQtApp): + """Launch Avalon Publisher.""" + + bl_idname = "wm.avalon_publisher" + bl_label = "Publish..." + + def execute(self, context): + host_tools.show_publish() + return {"FINISHED"} + + +class LaunchManager(LaunchQtApp): + """Launch Avalon Manager.""" + + bl_idname = "wm.avalon_manager" + bl_label = "Manage..." + _tool_name = "sceneinventory" + + def before_window_show(self): + self._window.refresh() + + +class LaunchWorkFiles(LaunchQtApp): + """Launch Avalon Work Files.""" + + bl_idname = "wm.avalon_workfiles" + bl_label = "Work Files..." + _tool_name = "workfiles" + + def execute(self, context): + result = super().execute(context) + self._window.set_context({ + "asset": avalon.api.Session["AVALON_ASSET"], + "silo": avalon.api.Session["AVALON_SILO"], + "task": avalon.api.Session["AVALON_TASK"] + }) + return result + + def before_window_show(self): + self._window.root = str(Path( + os.environ.get("AVALON_WORKDIR", ""), + os.environ.get("AVALON_SCENEDIR", ""), + )) + self._window.refresh() + + +class TOPBAR_MT_avalon(bpy.types.Menu): + """Avalon menu.""" + + bl_idname = "TOPBAR_MT_avalon" + bl_label = os.environ.get("AVALON_LABEL") + + def draw(self, context): + """Draw the menu in the UI.""" + + layout = self.layout + + pcoll = PREVIEW_COLLECTIONS.get("avalon") + if pcoll: + pyblish_menu_icon = pcoll["pyblish_menu_icon"] + pyblish_menu_icon_id = pyblish_menu_icon.icon_id + else: + pyblish_menu_icon_id = 0 + + asset = avalon.api.Session['AVALON_ASSET'] + task = avalon.api.Session['AVALON_TASK'] + context_label = f"{asset}, {task}" + context_label_item = layout.row() + context_label_item.operator( + LaunchWorkFiles.bl_idname, text=context_label + ) + context_label_item.enabled = False + layout.separator() + layout.operator(LaunchCreator.bl_idname, text="Create...") + layout.operator(LaunchLoader.bl_idname, text="Load...") + layout.operator( + LaunchPublisher.bl_idname, + text="Publish...", + icon_value=pyblish_menu_icon_id, + ) + layout.operator(LaunchManager.bl_idname, text="Manage...") + layout.separator() + layout.operator(LaunchWorkFiles.bl_idname, text="Work Files...") + # TODO (jasper): maybe add 'Reload Pipeline', 'Reset Frame Range' and + # 'Reset Resolution'? + + +def draw_avalon_menu(self, context): + """Draw the Avalon menu in the top bar.""" + + self.layout.menu(TOPBAR_MT_avalon.bl_idname) + + +classes = [ + LaunchCreator, + LaunchLoader, + LaunchPublisher, + LaunchManager, + LaunchWorkFiles, + TOPBAR_MT_avalon, +] + + +def register(): + "Register the operators and menu." + + pcoll = bpy.utils.previews.new() + pyblish_icon_file = Path(__file__).parent / "icons" / "pyblish-32x32.png" + pcoll.load("pyblish_menu_icon", str(pyblish_icon_file.absolute()), 'IMAGE') + PREVIEW_COLLECTIONS["avalon"] = pcoll + + for cls in classes: + bpy.utils.register_class(cls) + bpy.types.TOPBAR_MT_editor_menus.append(draw_avalon_menu) + + +def unregister(): + """Unregister the operators and menu.""" + + pcoll = PREVIEW_COLLECTIONS.pop("avalon") + bpy.utils.previews.remove(pcoll) + bpy.types.TOPBAR_MT_editor_menus.remove(draw_avalon_menu) + for cls in reversed(classes): + bpy.utils.unregister_class(cls) diff --git a/openpype/hosts/blender/api/pipeline.py b/openpype/hosts/blender/api/pipeline.py new file mode 100644 index 0000000000..0e5104fea9 --- /dev/null +++ b/openpype/hosts/blender/api/pipeline.py @@ -0,0 +1,427 @@ +import os +import sys +import importlib +import traceback +from typing import Callable, Dict, Iterator, List, Optional + +import bpy + +from . import lib +from . import ops + +import pyblish.api +import avalon.api +from avalon import io, schema +from avalon.pipeline import AVALON_CONTAINER_ID + +from openpype.api import Logger +import openpype.hosts.blender + +HOST_DIR = os.path.dirname(os.path.abspath(openpype.hosts.blender.__file__)) +PLUGINS_DIR = os.path.join(HOST_DIR, "plugins") +PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") +LOAD_PATH = os.path.join(PLUGINS_DIR, "load") +CREATE_PATH = os.path.join(PLUGINS_DIR, "create") +INVENTORY_PATH = os.path.join(PLUGINS_DIR, "inventory") + +ORIGINAL_EXCEPTHOOK = sys.excepthook + +AVALON_INSTANCES = "AVALON_INSTANCES" +AVALON_CONTAINERS = "AVALON_CONTAINERS" +AVALON_PROPERTY = 'avalon' +IS_HEADLESS = bpy.app.background + +log = Logger.get_logger(__name__) + + +def pype_excepthook_handler(*args): + traceback.print_exception(*args) + + +def install(): + """Install Blender configuration for Avalon.""" + sys.excepthook = pype_excepthook_handler + + pyblish.api.register_host("blender") + pyblish.api.register_plugin_path(str(PUBLISH_PATH)) + + avalon.api.register_plugin_path(avalon.api.Loader, str(LOAD_PATH)) + avalon.api.register_plugin_path(avalon.api.Creator, str(CREATE_PATH)) + + lib.append_user_scripts() + + avalon.api.on("new", on_new) + avalon.api.on("open", on_open) + _register_callbacks() + _register_events() + + if not IS_HEADLESS: + ops.register() + + +def uninstall(): + """Uninstall Blender configuration for Avalon.""" + sys.excepthook = ORIGINAL_EXCEPTHOOK + + pyblish.api.deregister_host("blender") + pyblish.api.deregister_plugin_path(str(PUBLISH_PATH)) + + avalon.api.deregister_plugin_path(avalon.api.Loader, str(LOAD_PATH)) + avalon.api.deregister_plugin_path(avalon.api.Creator, str(CREATE_PATH)) + + if not IS_HEADLESS: + ops.unregister() + + +def set_start_end_frames(): + asset_name = io.Session["AVALON_ASSET"] + asset_doc = io.find_one({ + "type": "asset", + "name": asset_name + }) + + scene = bpy.context.scene + + # Default scene settings + frameStart = scene.frame_start + frameEnd = scene.frame_end + fps = scene.render.fps + resolution_x = scene.render.resolution_x + resolution_y = scene.render.resolution_y + + # Check if settings are set + data = asset_doc.get("data") + + if not data: + return + + if data.get("frameStart"): + frameStart = data.get("frameStart") + if data.get("frameEnd"): + frameEnd = data.get("frameEnd") + if data.get("fps"): + fps = data.get("fps") + if data.get("resolutionWidth"): + resolution_x = data.get("resolutionWidth") + if data.get("resolutionHeight"): + resolution_y = data.get("resolutionHeight") + + scene.frame_start = frameStart + scene.frame_end = frameEnd + scene.render.fps = fps + scene.render.resolution_x = resolution_x + scene.render.resolution_y = resolution_y + + +def on_new(arg1, arg2): + set_start_end_frames() + + +def on_open(arg1, arg2): + set_start_end_frames() + + +@bpy.app.handlers.persistent +def _on_save_pre(*args): + avalon.api.emit("before_save", args) + + +@bpy.app.handlers.persistent +def _on_save_post(*args): + avalon.api.emit("save", args) + + +@bpy.app.handlers.persistent +def _on_load_post(*args): + # Detect new file or opening an existing file + if bpy.data.filepath: + # Likely this was an open operation since it has a filepath + avalon.api.emit("open", args) + else: + avalon.api.emit("new", args) + + ops.OpenFileCacher.post_load() + + +def _register_callbacks(): + """Register callbacks for certain events.""" + def _remove_handler(handlers: List, callback: Callable): + """Remove the callback from the given handler list.""" + + try: + handlers.remove(callback) + except ValueError: + pass + + # TODO (jasper): implement on_init callback? + + # Be sure to remove existig ones first. + _remove_handler(bpy.app.handlers.save_pre, _on_save_pre) + _remove_handler(bpy.app.handlers.save_post, _on_save_post) + _remove_handler(bpy.app.handlers.load_post, _on_load_post) + + bpy.app.handlers.save_pre.append(_on_save_pre) + bpy.app.handlers.save_post.append(_on_save_post) + bpy.app.handlers.load_post.append(_on_load_post) + + log.info("Installed event handler _on_save_pre...") + log.info("Installed event handler _on_save_post...") + log.info("Installed event handler _on_load_post...") + + +def _on_task_changed(*args): + """Callback for when the task in the context is changed.""" + + # TODO (jasper): Blender has no concept of projects or workspace. + # It would be nice to override 'bpy.ops.wm.open_mainfile' so it takes the + # workdir as starting directory. But I don't know if that is possible. + # Another option would be to create a custom 'File Selector' and add the + # `directory` attribute, so it opens in that directory (does it?). + # https://docs.blender.org/api/blender2.8/bpy.types.Operator.html#calling-a-file-selector + # https://docs.blender.org/api/blender2.8/bpy.types.WindowManager.html#bpy.types.WindowManager.fileselect_add + workdir = avalon.api.Session["AVALON_WORKDIR"] + log.debug("New working directory: %s", workdir) + + +def _register_events(): + """Install callbacks for specific events.""" + + avalon.api.on("taskChanged", _on_task_changed) + log.info("Installed event callback for 'taskChanged'...") + + +def reload_pipeline(*args): + """Attempt to reload pipeline at run-time. + + Warning: + This is primarily for development and debugging purposes and not well + tested. + + """ + + avalon.api.uninstall() + + for module in ( + "avalon.io", + "avalon.lib", + "avalon.pipeline", + "avalon.tools.creator.app", + "avalon.tools.manager.app", + "avalon.api", + "avalon.tools", + ): + module = importlib.import_module(module) + importlib.reload(module) + + +def _discover_gui() -> Optional[Callable]: + """Return the most desirable of the currently registered GUIs""" + + # Prefer last registered + guis = reversed(pyblish.api.registered_guis()) + + for gui in guis: + try: + gui = __import__(gui).show + except (ImportError, AttributeError): + continue + else: + return gui + + return None + + +def add_to_avalon_container(container: bpy.types.Collection): + """Add the container to the Avalon container.""" + + avalon_container = bpy.data.collections.get(AVALON_CONTAINERS) + if not avalon_container: + avalon_container = bpy.data.collections.new(name=AVALON_CONTAINERS) + + # Link the container to the scene so it's easily visible to the artist + # and can be managed easily. Otherwise it's only found in "Blender + # File" view and it will be removed by Blenders garbage collection, + # unless you set a 'fake user'. + bpy.context.scene.collection.children.link(avalon_container) + + avalon_container.children.link(container) + + # Disable Avalon containers for the view layers. + for view_layer in bpy.context.scene.view_layers: + for child in view_layer.layer_collection.children: + if child.collection == avalon_container: + child.exclude = True + + +def metadata_update(node: bpy.types.bpy_struct_meta_idprop, data: Dict): + """Imprint the node with metadata. + + Existing metadata will be updated. + """ + + if not node.get(AVALON_PROPERTY): + node[AVALON_PROPERTY] = dict() + for key, value in data.items(): + if value is None: + continue + node[AVALON_PROPERTY][key] = value + + +def containerise(name: str, + namespace: str, + nodes: List, + context: Dict, + loader: Optional[str] = None, + suffix: Optional[str] = "CON") -> bpy.types.Collection: + """Bundle `nodes` into an assembly and imprint it with metadata + + Containerisation enables a tracking of version, author and origin + for loaded assets. + + Arguments: + name: Name of resulting assembly + namespace: Namespace under which to host container + nodes: Long names of nodes to containerise + context: Asset information + loader: Name of loader used to produce this container. + suffix: Suffix of container, defaults to `_CON`. + + Returns: + The container assembly + + """ + + node_name = f"{context['asset']['name']}_{name}" + if namespace: + node_name = f"{namespace}:{node_name}" + if suffix: + node_name = f"{node_name}_{suffix}" + container = bpy.data.collections.new(name=node_name) + # Link the children nodes + for obj in nodes: + container.objects.link(obj) + + data = { + "schema": "openpype:container-2.0", + "id": AVALON_CONTAINER_ID, + "name": name, + "namespace": namespace or '', + "loader": str(loader), + "representation": str(context["representation"]["_id"]), + } + + metadata_update(container, data) + add_to_avalon_container(container) + + return container + + +def containerise_existing( + container: bpy.types.Collection, + name: str, + namespace: str, + context: Dict, + loader: Optional[str] = None, + suffix: Optional[str] = "CON") -> bpy.types.Collection: + """Imprint or update container with metadata. + + Arguments: + name: Name of resulting assembly + namespace: Namespace under which to host container + context: Asset information + loader: Name of loader used to produce this container. + suffix: Suffix of container, defaults to `_CON`. + + Returns: + The container assembly + """ + + node_name = container.name + if suffix: + node_name = f"{node_name}_{suffix}" + container.name = node_name + data = { + "schema": "openpype:container-2.0", + "id": AVALON_CONTAINER_ID, + "name": name, + "namespace": namespace or '', + "loader": str(loader), + "representation": str(context["representation"]["_id"]), + } + + metadata_update(container, data) + add_to_avalon_container(container) + + return container + + +def parse_container(container: bpy.types.Collection, + validate: bool = True) -> Dict: + """Return the container node's full container data. + + Args: + container: A container node name. + validate: turn the validation for the container on or off + + Returns: + The container schema data for this container node. + + """ + + data = lib.read(container) + + # Append transient data + data["objectName"] = container.name + + if validate: + schema.validate(data) + + return data + + +def ls() -> Iterator: + """List containers from active Blender scene. + + This is the host-equivalent of api.ls(), but instead of listing assets on + disk, it lists assets already loaded in Blender; once loaded they are + called containers. + """ + + for container in lib.lsattr("id", AVALON_CONTAINER_ID): + yield parse_container(container) + + +def update_hierarchy(containers): + """Hierarchical container support + + This is the function to support Scene Inventory to draw hierarchical + view for containers. + + We need both parent and children to visualize the graph. + + """ + + all_containers = set(ls()) # lookup set + + for container in containers: + # Find parent + # FIXME (jasperge): re-evaluate this. How would it be possible + # to 'nest' assets? Collections can have several parents, for + # now assume it has only 1 parent + parent = [ + coll for coll in bpy.data.collections if container in coll.children + ] + for node in parent: + if node in all_containers: + container["parent"] = node + break + + log.debug("Container: %s", container) + + yield container + + +def publish(): + """Shorthand to publish from within host.""" + + return pyblish.util.publish() diff --git a/openpype/hosts/blender/api/plugin.py b/openpype/hosts/blender/api/plugin.py index 6d437059b8..602b3b0ff9 100644 --- a/openpype/hosts/blender/api/plugin.py +++ b/openpype/hosts/blender/api/plugin.py @@ -5,10 +5,17 @@ from typing import Dict, List, Optional import bpy -from avalon import api, blender -from avalon.blender import ops -from avalon.blender.pipeline import AVALON_CONTAINERS +import avalon.api from openpype.api import PypeCreatorMixin +from .pipeline import AVALON_CONTAINERS +from .ops import ( + MainThreadItem, + execute_in_main_thread +) +from .lib import ( + imprint, + get_selection +) VALID_EXTENSIONS = [".blend", ".json", ".abc", ".fbx"] @@ -119,11 +126,27 @@ def deselect_all(): bpy.context.view_layer.objects.active = active -class Creator(PypeCreatorMixin, blender.Creator): - pass +class Creator(PypeCreatorMixin, avalon.api.Creator): + """Base class for Creator plug-ins.""" + def process(self): + collection = bpy.data.collections.new(name=self.data["subset"]) + bpy.context.scene.collection.children.link(collection) + imprint(collection, self.data) + + if (self.options or {}).get("useSelection"): + for obj in get_selection(): + collection.objects.link(obj) + + return collection -class AssetLoader(api.Loader): +class Loader(avalon.api.Loader): + """Base class for Loader plug-ins.""" + + hosts = ["blender"] + + +class AssetLoader(avalon.api.Loader): """A basic AssetLoader for Blender This will implement the basic logic for linking/appending assets @@ -191,8 +214,8 @@ class AssetLoader(api.Loader): namespace: Optional[str] = None, options: Optional[Dict] = None) -> Optional[bpy.types.Collection]: """ Run the loader on Blender main thread""" - mti = ops.MainThreadItem(self._load, context, name, namespace, options) - ops.execute_in_main_thread(mti) + mti = MainThreadItem(self._load, context, name, namespace, options) + execute_in_main_thread(mti) def _load(self, context: dict, @@ -257,8 +280,8 @@ class AssetLoader(api.Loader): def update(self, container: Dict, representation: Dict): """ Run the update on Blender main thread""" - mti = ops.MainThreadItem(self.exec_update, container, representation) - ops.execute_in_main_thread(mti) + mti = MainThreadItem(self.exec_update, container, representation) + execute_in_main_thread(mti) def exec_remove(self, container: Dict) -> bool: """Must be implemented by a sub-class""" @@ -266,5 +289,5 @@ class AssetLoader(api.Loader): def remove(self, container: Dict) -> bool: """ Run the remove on Blender main thread""" - mti = ops.MainThreadItem(self.exec_remove, container) - ops.execute_in_main_thread(mti) + mti = MainThreadItem(self.exec_remove, container) + execute_in_main_thread(mti) diff --git a/openpype/hosts/blender/api/workio.py b/openpype/hosts/blender/api/workio.py new file mode 100644 index 0000000000..fd68761982 --- /dev/null +++ b/openpype/hosts/blender/api/workio.py @@ -0,0 +1,90 @@ +"""Host API required for Work Files.""" + +from pathlib import Path +from typing import List, Optional + +import bpy +from avalon import api + + +class OpenFileCacher: + """Store information about opening file. + + When file is opening QApplcation events should not be processed. + """ + opening_file = False + + @classmethod + def post_load(cls): + cls.opening_file = False + + @classmethod + def set_opening(cls): + cls.opening_file = True + + +def open_file(filepath: str) -> Optional[str]: + """Open the scene file in Blender.""" + OpenFileCacher.set_opening() + + preferences = bpy.context.preferences + load_ui = preferences.filepaths.use_load_ui + use_scripts = preferences.filepaths.use_scripts_auto_execute + result = bpy.ops.wm.open_mainfile( + filepath=filepath, + load_ui=load_ui, + use_scripts=use_scripts, + ) + + if result == {'FINISHED'}: + return filepath + return None + + +def save_file(filepath: str, copy: bool = False) -> Optional[str]: + """Save the open scene file.""" + + preferences = bpy.context.preferences + compress = preferences.filepaths.use_file_compression + relative_remap = preferences.filepaths.use_relative_paths + result = bpy.ops.wm.save_as_mainfile( + filepath=filepath, + compress=compress, + relative_remap=relative_remap, + copy=copy, + ) + + if result == {'FINISHED'}: + return filepath + return None + + +def current_file() -> Optional[str]: + """Return the path of the open scene file.""" + + current_filepath = bpy.data.filepath + if Path(current_filepath).is_file(): + return current_filepath + return None + + +def has_unsaved_changes() -> bool: + """Does the open scene file have unsaved changes?""" + + return bpy.data.is_dirty + + +def file_extensions() -> List[str]: + """Return the supported file extensions for Blender scene files.""" + + return api.HOST_WORKFILE_EXTENSIONS["blender"] + + +def work_root(session: dict) -> str: + """Return the default root to browse for work files.""" + + work_dir = session["AVALON_WORKDIR"] + scene_dir = session.get("AVALON_SCENEDIR") + if scene_dir: + return str(Path(work_dir, scene_dir)) + return work_dir diff --git a/openpype/hosts/blender/blender_addon/startup/init.py b/openpype/hosts/blender/blender_addon/startup/init.py new file mode 100644 index 0000000000..e43373bc6c --- /dev/null +++ b/openpype/hosts/blender/blender_addon/startup/init.py @@ -0,0 +1,4 @@ +from avalon import pipeline +from openpype.hosts.blender import api + +pipeline.install(api) diff --git a/openpype/hosts/blender/plugins/__init__.py b/openpype/hosts/blender/plugins/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openpype/hosts/blender/plugins/create/__init__.py b/openpype/hosts/blender/plugins/create/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openpype/hosts/blender/plugins/create/create_action.py b/openpype/hosts/blender/plugins/create/create_action.py index f7bb2bfc26..5f66f5da6e 100644 --- a/openpype/hosts/blender/plugins/create/create_action.py +++ b/openpype/hosts/blender/plugins/create/create_action.py @@ -4,7 +4,7 @@ import bpy from avalon import api import openpype.hosts.blender.api.plugin -from avalon.blender import lib +from openpype.hosts.blender.api import lib class CreateAction(openpype.hosts.blender.api.plugin.Creator): diff --git a/openpype/hosts/blender/plugins/create/create_animation.py b/openpype/hosts/blender/plugins/create/create_animation.py index 3b4cabe8ec..b88010ae90 100644 --- a/openpype/hosts/blender/plugins/create/create_animation.py +++ b/openpype/hosts/blender/plugins/create/create_animation.py @@ -3,9 +3,8 @@ import bpy from avalon import api -from avalon.blender import lib, ops -from avalon.blender.pipeline import AVALON_INSTANCES -from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api import plugin, lib, ops +from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES class CreateAnimation(plugin.Creator): diff --git a/openpype/hosts/blender/plugins/create/create_camera.py b/openpype/hosts/blender/plugins/create/create_camera.py index 6fa80b5a5d..cc796d464d 100644 --- a/openpype/hosts/blender/plugins/create/create_camera.py +++ b/openpype/hosts/blender/plugins/create/create_camera.py @@ -3,9 +3,8 @@ import bpy from avalon import api -from avalon.blender import lib, ops -from avalon.blender.pipeline import AVALON_INSTANCES -from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api import plugin, lib, ops +from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES class CreateCamera(plugin.Creator): diff --git a/openpype/hosts/blender/plugins/create/create_layout.py b/openpype/hosts/blender/plugins/create/create_layout.py index dac12e19b1..f62cbc52ba 100644 --- a/openpype/hosts/blender/plugins/create/create_layout.py +++ b/openpype/hosts/blender/plugins/create/create_layout.py @@ -3,9 +3,8 @@ import bpy from avalon import api -from avalon.blender import lib, ops -from avalon.blender.pipeline import AVALON_INSTANCES -from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api import plugin, lib, ops +from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES class CreateLayout(plugin.Creator): diff --git a/openpype/hosts/blender/plugins/create/create_model.py b/openpype/hosts/blender/plugins/create/create_model.py index 903b70033b..75c90f9bb1 100644 --- a/openpype/hosts/blender/plugins/create/create_model.py +++ b/openpype/hosts/blender/plugins/create/create_model.py @@ -3,9 +3,8 @@ import bpy from avalon import api -from avalon.blender import lib, ops -from avalon.blender.pipeline import AVALON_INSTANCES -from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api import plugin, lib, ops +from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES class CreateModel(plugin.Creator): diff --git a/openpype/hosts/blender/plugins/create/create_pointcache.py b/openpype/hosts/blender/plugins/create/create_pointcache.py index 03a468f82e..bf5a84048f 100644 --- a/openpype/hosts/blender/plugins/create/create_pointcache.py +++ b/openpype/hosts/blender/plugins/create/create_pointcache.py @@ -3,8 +3,8 @@ import bpy from avalon import api -from avalon.blender import lib import openpype.hosts.blender.api.plugin +from openpype.hosts.blender.api import lib class CreatePointcache(openpype.hosts.blender.api.plugin.Creator): diff --git a/openpype/hosts/blender/plugins/create/create_rig.py b/openpype/hosts/blender/plugins/create/create_rig.py index ec74e279c6..65f5061924 100644 --- a/openpype/hosts/blender/plugins/create/create_rig.py +++ b/openpype/hosts/blender/plugins/create/create_rig.py @@ -3,9 +3,8 @@ import bpy from avalon import api -from avalon.blender import lib, ops -from avalon.blender.pipeline import AVALON_INSTANCES -from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api import plugin, lib, ops +from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES class CreateRig(plugin.Creator): diff --git a/openpype/hosts/blender/plugins/load/__init__.py b/openpype/hosts/blender/plugins/load/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openpype/hosts/blender/plugins/load/load_abc.py b/openpype/hosts/blender/plugins/load/load_abc.py index 5969432c36..07800521c9 100644 --- a/openpype/hosts/blender/plugins/load/load_abc.py +++ b/openpype/hosts/blender/plugins/load/load_abc.py @@ -7,11 +7,12 @@ from typing import Dict, List, Optional import bpy from avalon import api -from avalon.blender import lib -from avalon.blender.pipeline import AVALON_CONTAINERS -from avalon.blender.pipeline import AVALON_CONTAINER_ID -from avalon.blender.pipeline import AVALON_PROPERTY -from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api.pipeline import ( + AVALON_CONTAINERS, + AVALON_PROPERTY, + AVALON_CONTAINER_ID +) +from openpype.hosts.blender.api import plugin, lib class CacheModelLoader(plugin.AssetLoader): diff --git a/openpype/hosts/blender/plugins/load/load_animation.py b/openpype/hosts/blender/plugins/load/load_animation.py index 47c48248b2..6b8d4abd04 100644 --- a/openpype/hosts/blender/plugins/load/load_animation.py +++ b/openpype/hosts/blender/plugins/load/load_animation.py @@ -1,16 +1,11 @@ """Load an animation in Blender.""" -import logging from typing import Dict, List, Optional import bpy -from avalon.blender.pipeline import AVALON_PROPERTY from openpype.hosts.blender.api import plugin - - -logger = logging.getLogger("openpype").getChild( - "blender").getChild("load_animation") +from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY class BlendAnimationLoader(plugin.AssetLoader): diff --git a/openpype/hosts/blender/plugins/load/load_audio.py b/openpype/hosts/blender/plugins/load/load_audio.py index 660e4d7890..e065150c15 100644 --- a/openpype/hosts/blender/plugins/load/load_audio.py +++ b/openpype/hosts/blender/plugins/load/load_audio.py @@ -7,10 +7,12 @@ from typing import Dict, List, Optional import bpy from avalon import api -from avalon.blender.pipeline import AVALON_CONTAINERS -from avalon.blender.pipeline import AVALON_CONTAINER_ID -from avalon.blender.pipeline import AVALON_PROPERTY from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api.pipeline import ( + AVALON_CONTAINERS, + AVALON_PROPERTY, + AVALON_CONTAINER_ID +) class AudioLoader(plugin.AssetLoader): diff --git a/openpype/hosts/blender/plugins/load/load_camera_blend.py b/openpype/hosts/blender/plugins/load/load_camera_blend.py index 834eb467d8..61955f124d 100644 --- a/openpype/hosts/blender/plugins/load/load_camera_blend.py +++ b/openpype/hosts/blender/plugins/load/load_camera_blend.py @@ -8,10 +8,12 @@ from typing import Dict, List, Optional import bpy from avalon import api -from avalon.blender.pipeline import AVALON_CONTAINERS -from avalon.blender.pipeline import AVALON_CONTAINER_ID -from avalon.blender.pipeline import AVALON_PROPERTY from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api.pipeline import ( + AVALON_CONTAINERS, + AVALON_PROPERTY, + AVALON_CONTAINER_ID +) logger = logging.getLogger("openpype").getChild( "blender").getChild("load_camera") diff --git a/openpype/hosts/blender/plugins/load/load_camera_fbx.py b/openpype/hosts/blender/plugins/load/load_camera_fbx.py index 5edba7ec0c..175ddacf9f 100644 --- a/openpype/hosts/blender/plugins/load/load_camera_fbx.py +++ b/openpype/hosts/blender/plugins/load/load_camera_fbx.py @@ -7,11 +7,12 @@ from typing import Dict, List, Optional import bpy from avalon import api -from avalon.blender import lib -from avalon.blender.pipeline import AVALON_CONTAINERS -from avalon.blender.pipeline import AVALON_CONTAINER_ID -from avalon.blender.pipeline import AVALON_PROPERTY -from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api import plugin, lib +from openpype.hosts.blender.api.pipeline import ( + AVALON_CONTAINERS, + AVALON_PROPERTY, + AVALON_CONTAINER_ID +) class FbxCameraLoader(plugin.AssetLoader): diff --git a/openpype/hosts/blender/plugins/load/load_fbx.py b/openpype/hosts/blender/plugins/load/load_fbx.py index 5f69aecb1a..c6e6af5592 100644 --- a/openpype/hosts/blender/plugins/load/load_fbx.py +++ b/openpype/hosts/blender/plugins/load/load_fbx.py @@ -7,11 +7,12 @@ from typing import Dict, List, Optional import bpy from avalon import api -from avalon.blender import lib -from avalon.blender.pipeline import AVALON_CONTAINERS -from avalon.blender.pipeline import AVALON_CONTAINER_ID -from avalon.blender.pipeline import AVALON_PROPERTY -from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api import plugin, lib +from openpype.hosts.blender.api.pipeline import ( + AVALON_CONTAINERS, + AVALON_PROPERTY, + AVALON_CONTAINER_ID +) class FbxModelLoader(plugin.AssetLoader): diff --git a/openpype/hosts/blender/plugins/load/load_layout_blend.py b/openpype/hosts/blender/plugins/load/load_layout_blend.py index 4c1f751a77..dff7ffb9c6 100644 --- a/openpype/hosts/blender/plugins/load/load_layout_blend.py +++ b/openpype/hosts/blender/plugins/load/load_layout_blend.py @@ -7,10 +7,12 @@ from typing import Dict, List, Optional import bpy from avalon import api -from avalon.blender.pipeline import AVALON_CONTAINERS -from avalon.blender.pipeline import AVALON_CONTAINER_ID -from avalon.blender.pipeline import AVALON_PROPERTY from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api.pipeline import ( + AVALON_CONTAINERS, + AVALON_PROPERTY, + AVALON_CONTAINER_ID +) class BlendLayoutLoader(plugin.AssetLoader): diff --git a/openpype/hosts/blender/plugins/load/load_layout_json.py b/openpype/hosts/blender/plugins/load/load_layout_json.py index 442cf05d85..2378ae4807 100644 --- a/openpype/hosts/blender/plugins/load/load_layout_json.py +++ b/openpype/hosts/blender/plugins/load/load_layout_json.py @@ -1,18 +1,20 @@ """Load a layout in Blender.""" +import json from pathlib import Path from pprint import pformat from typing import Dict, Optional import bpy -import json from avalon import api -from avalon.blender.pipeline import AVALON_CONTAINERS -from avalon.blender.pipeline import AVALON_CONTAINER_ID -from avalon.blender.pipeline import AVALON_PROPERTY -from avalon.blender.pipeline import AVALON_INSTANCES from openpype import lib +from openpype.hosts.blender.api.pipeline import ( + AVALON_INSTANCES, + AVALON_CONTAINERS, + AVALON_PROPERTY, + AVALON_CONTAINER_ID +) from openpype.hosts.blender.api import plugin diff --git a/openpype/hosts/blender/plugins/load/load_look.py b/openpype/hosts/blender/plugins/load/load_look.py index 279af2b626..066ec0101b 100644 --- a/openpype/hosts/blender/plugins/load/load_look.py +++ b/openpype/hosts/blender/plugins/load/load_look.py @@ -8,8 +8,12 @@ import os import json import bpy -from avalon import api, blender -import openpype.hosts.blender.api.plugin as plugin +from avalon import api +from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api.pipeline import ( + containerise_existing, + AVALON_PROPERTY +) class BlendLookLoader(plugin.AssetLoader): @@ -105,7 +109,7 @@ class BlendLookLoader(plugin.AssetLoader): container = bpy.data.collections.new(lib_container) container.name = container_name - blender.pipeline.containerise_existing( + containerise_existing( container, name, namespace, @@ -113,7 +117,7 @@ class BlendLookLoader(plugin.AssetLoader): self.__class__.__name__, ) - metadata = container.get(blender.pipeline.AVALON_PROPERTY) + metadata = container.get(AVALON_PROPERTY) metadata["libpath"] = libpath metadata["lib_container"] = lib_container @@ -161,7 +165,7 @@ class BlendLookLoader(plugin.AssetLoader): f"Unsupported file: {libpath}" ) - collection_metadata = collection.get(blender.pipeline.AVALON_PROPERTY) + collection_metadata = collection.get(AVALON_PROPERTY) collection_libpath = collection_metadata["libpath"] normalized_collection_libpath = ( @@ -204,7 +208,7 @@ class BlendLookLoader(plugin.AssetLoader): if not collection: return False - collection_metadata = collection.get(blender.pipeline.AVALON_PROPERTY) + collection_metadata = collection.get(AVALON_PROPERTY) for obj in collection_metadata['objects']: for child in self.get_all_children(obj): diff --git a/openpype/hosts/blender/plugins/load/load_model.py b/openpype/hosts/blender/plugins/load/load_model.py index c33c656dec..861da9b852 100644 --- a/openpype/hosts/blender/plugins/load/load_model.py +++ b/openpype/hosts/blender/plugins/load/load_model.py @@ -7,10 +7,12 @@ from typing import Dict, List, Optional import bpy from avalon import api -from avalon.blender.pipeline import AVALON_CONTAINERS -from avalon.blender.pipeline import AVALON_CONTAINER_ID -from avalon.blender.pipeline import AVALON_PROPERTY from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api.pipeline import ( + AVALON_CONTAINERS, + AVALON_PROPERTY, + AVALON_CONTAINER_ID +) class BlendModelLoader(plugin.AssetLoader): diff --git a/openpype/hosts/blender/plugins/load/load_rig.py b/openpype/hosts/blender/plugins/load/load_rig.py index e80da8af45..b753488144 100644 --- a/openpype/hosts/blender/plugins/load/load_rig.py +++ b/openpype/hosts/blender/plugins/load/load_rig.py @@ -7,11 +7,13 @@ from typing import Dict, List, Optional import bpy from avalon import api -from avalon.blender.pipeline import AVALON_CONTAINERS -from avalon.blender.pipeline import AVALON_CONTAINER_ID -from avalon.blender.pipeline import AVALON_PROPERTY from openpype import lib from openpype.hosts.blender.api import plugin +from openpype.hosts.blender.api.pipeline import ( + AVALON_CONTAINERS, + AVALON_PROPERTY, + AVALON_CONTAINER_ID +) class BlendRigLoader(plugin.AssetLoader): diff --git a/openpype/hosts/blender/plugins/publish/__init__.py b/openpype/hosts/blender/plugins/publish/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openpype/hosts/blender/plugins/publish/collect_instances.py b/openpype/hosts/blender/plugins/publish/collect_instances.py index 0d683dace4..bc4b5ab092 100644 --- a/openpype/hosts/blender/plugins/publish/collect_instances.py +++ b/openpype/hosts/blender/plugins/publish/collect_instances.py @@ -1,11 +1,13 @@ +import json from typing import Generator import bpy -import json import pyblish.api -from avalon.blender.pipeline import AVALON_PROPERTY -from avalon.blender.pipeline import AVALON_INSTANCES +from openpype.hosts.blender.api.pipeline import ( + AVALON_INSTANCES, + AVALON_PROPERTY, +) class CollectInstances(pyblish.api.ContextPlugin): diff --git a/openpype/hosts/blender/plugins/publish/extract_abc.py b/openpype/hosts/blender/plugins/publish/extract_abc.py index b75bec4e28..a26a92f7e4 100644 --- a/openpype/hosts/blender/plugins/publish/extract_abc.py +++ b/openpype/hosts/blender/plugins/publish/extract_abc.py @@ -1,10 +1,10 @@ import os +import bpy + from openpype import api from openpype.hosts.blender.api import plugin -from avalon.blender.pipeline import AVALON_PROPERTY - -import bpy +from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY class ExtractABC(api.Extractor): diff --git a/openpype/hosts/blender/plugins/publish/extract_blend.py b/openpype/hosts/blender/plugins/publish/extract_blend.py index 565e2fe425..9add633f05 100644 --- a/openpype/hosts/blender/plugins/publish/extract_blend.py +++ b/openpype/hosts/blender/plugins/publish/extract_blend.py @@ -2,7 +2,6 @@ import os import bpy -# import avalon.blender.workio import openpype.api diff --git a/openpype/hosts/blender/plugins/publish/extract_camera.py b/openpype/hosts/blender/plugins/publish/extract_camera.py index a0e78178c8..597dcecd21 100644 --- a/openpype/hosts/blender/plugins/publish/extract_camera.py +++ b/openpype/hosts/blender/plugins/publish/extract_camera.py @@ -1,10 +1,10 @@ import os +import bpy + from openpype import api from openpype.hosts.blender.api import plugin -import bpy - class ExtractCamera(api.Extractor): """Extract as the camera as FBX.""" diff --git a/openpype/hosts/blender/plugins/publish/extract_fbx.py b/openpype/hosts/blender/plugins/publish/extract_fbx.py index f9ffdea1d1..26344777a8 100644 --- a/openpype/hosts/blender/plugins/publish/extract_fbx.py +++ b/openpype/hosts/blender/plugins/publish/extract_fbx.py @@ -1,10 +1,10 @@ import os +import bpy + from openpype import api from openpype.hosts.blender.api import plugin -from avalon.blender.pipeline import AVALON_PROPERTY - -import bpy +from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY class ExtractFBX(api.Extractor): diff --git a/openpype/hosts/blender/plugins/publish/extract_fbx_animation.py b/openpype/hosts/blender/plugins/publish/extract_fbx_animation.py index 16443b760c..50a414c0d6 100644 --- a/openpype/hosts/blender/plugins/publish/extract_fbx_animation.py +++ b/openpype/hosts/blender/plugins/publish/extract_fbx_animation.py @@ -7,7 +7,7 @@ import bpy_extras.anim_utils from openpype import api from openpype.hosts.blender.api import plugin -from avalon.blender.pipeline import AVALON_PROPERTY +from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY class ExtractAnimationFBX(api.Extractor): diff --git a/openpype/hosts/blender/plugins/publish/extract_layout.py b/openpype/hosts/blender/plugins/publish/extract_layout.py index cd081b4479..1ecf66099c 100644 --- a/openpype/hosts/blender/plugins/publish/extract_layout.py +++ b/openpype/hosts/blender/plugins/publish/extract_layout.py @@ -4,7 +4,7 @@ import json import bpy from avalon import io -from avalon.blender.pipeline import AVALON_PROPERTY +from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY import openpype.api diff --git a/openpype/hosts/blender/plugins/publish/increment_workfile_version.py b/openpype/hosts/blender/plugins/publish/increment_workfile_version.py index b81e1111ea..986842d0d6 100644 --- a/openpype/hosts/blender/plugins/publish/increment_workfile_version.py +++ b/openpype/hosts/blender/plugins/publish/increment_workfile_version.py @@ -1,5 +1,5 @@ import pyblish.api -import avalon.blender.workio +from openpype.hosts.blender.api.workio import save_file class IncrementWorkfileVersion(pyblish.api.ContextPlugin): @@ -20,6 +20,6 @@ class IncrementWorkfileVersion(pyblish.api.ContextPlugin): path = context.data["currentFile"] filepath = version_up(path) - avalon.blender.workio.save_file(filepath, copy=False) + save_file(filepath, copy=False) self.log.info('Incrementing script version') diff --git a/openpype/hosts/blender/startup/init.py b/openpype/hosts/blender/startup/init.py deleted file mode 100644 index 4b4e48fedc..0000000000 --- a/openpype/hosts/blender/startup/init.py +++ /dev/null @@ -1,3 +0,0 @@ -from openpype.hosts.blender import api - -api.install() From 239ab2cbaaa70b165cd1a316fd359f44af7907eb Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 21 Jan 2022 11:37:37 +0100 Subject: [PATCH 070/123] pype info will also show build version --- openpype/lib/pype_info.py | 8 +++++--- openpype/tools/tray/pype_info_widget.py | 15 +++++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/openpype/lib/pype_info.py b/openpype/lib/pype_info.py index 848a505187..8370ecc88f 100644 --- a/openpype/lib/pype_info.py +++ b/openpype/lib/pype_info.py @@ -10,11 +10,12 @@ from .execute import get_openpype_execute_args from .local_settings import get_local_site_id from .openpype_version import ( is_running_from_build, - get_openpype_version + get_openpype_version, + get_build_version ) -def get_pype_info(): +def get_openpype_info(): """Information about currently used Pype process.""" executable_args = get_openpype_execute_args() if is_running_from_build(): @@ -23,6 +24,7 @@ def get_pype_info(): version_type = "code" return { + "build_verison": get_build_version(), "version": get_openpype_version(), "version_type": version_type, "executable": executable_args[-1], @@ -51,7 +53,7 @@ def get_workstation_info(): def get_all_current_info(): """All information about current process in one dictionary.""" return { - "pype": get_pype_info(), + "pype": get_openpype_info(), "workstation": get_workstation_info(), "env": os.environ.copy(), "local_settings": get_local_settings() diff --git a/openpype/tools/tray/pype_info_widget.py b/openpype/tools/tray/pype_info_widget.py index 2ca625f307..e68793b18c 100644 --- a/openpype/tools/tray/pype_info_widget.py +++ b/openpype/tools/tray/pype_info_widget.py @@ -9,7 +9,7 @@ from openpype.api import resources from openpype.settings.lib import get_local_settings from openpype.lib.pype_info import ( get_all_current_info, - get_pype_info, + get_openpype_info, get_workstation_info, extract_pype_info_to_file ) @@ -426,7 +426,7 @@ class PypeInfoSubWidget(QtWidgets.QWidget): """Create widget with information about OpenPype application.""" # Get pype info data - pype_info = get_pype_info() + pype_info = get_openpype_info() # Modify version key/values version_value = "{} ({})".format( pype_info.pop("version", self.not_applicable), @@ -435,13 +435,20 @@ class PypeInfoSubWidget(QtWidgets.QWidget): pype_info["version_value"] = version_value # Prepare lable mapping key_label_mapping = { - "version_value": "OpenPype version:", + "version_value": "Running version:", + "build_verison": "Build version:", "executable": "OpenPype executable:", "pype_root": "OpenPype location:", "mongo_url": "OpenPype Mongo URL:" } # Prepare keys order - keys_order = ["version_value", "executable", "pype_root", "mongo_url"] + keys_order = [ + "version_value", + "build_verison", + "executable", + "pype_root", + "mongo_url" + ] for key in pype_info.keys(): if key not in keys_order: keys_order.append(key) From e9d92ef96930334fd0ebfb49c227046d42de0c97 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 21 Jan 2022 11:37:51 +0100 Subject: [PATCH 071/123] trigger version check on start --- openpype/tools/tray/pype_tray.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py index c9b8aaa842..4abf0f5a83 100644 --- a/openpype/tools/tray/pype_tray.py +++ b/openpype/tools/tray/pype_tray.py @@ -328,8 +328,8 @@ class TrayManager: self.main_thread_timer = main_thread_timer version_check_timer = QtCore.QTimer() - version_check_timer.timeout.connect(self._on_version_check_timer) if self._version_check_interval > 0: + version_check_timer.timeout.connect(self._on_version_check_timer) version_check_timer.setInterval(self._version_check_interval) version_check_timer.start() self._version_check_timer = version_check_timer @@ -341,6 +341,9 @@ class TrayManager: def _startup_validations(self): """Run possible startup validations.""" + # Trigger version validation on start + self._version_check_timer.timeout.emit() + self._validate_settings_defaults() def _validate_settings_defaults(self): From ac79f24e403a8f1e606323b4208a9bb6e8281cb0 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 21 Jan 2022 12:11:33 +0100 Subject: [PATCH 072/123] handle situations when current version is higher --- openpype/lib/__init__.py | 3 +- openpype/lib/openpype_version.py | 29 +++++++++++++ openpype/tools/tray/pype_tray.py | 74 +++++++++++++++++++++++++------- 3 files changed, 90 insertions(+), 16 deletions(-) diff --git a/openpype/lib/__init__.py b/openpype/lib/__init__.py index 1c8f7a57af..7dd9a8793b 100644 --- a/openpype/lib/__init__.py +++ b/openpype/lib/__init__.py @@ -175,7 +175,8 @@ from .openpype_version import ( get_expected_version, is_running_from_build, is_running_staging, - is_current_version_studio_latest + is_current_version_studio_latest, + is_current_version_higher_than_expected ) terminal = Terminal diff --git a/openpype/lib/openpype_version.py b/openpype/lib/openpype_version.py index 201bf646e9..d547d34755 100644 --- a/openpype/lib/openpype_version.py +++ b/openpype/lib/openpype_version.py @@ -195,3 +195,32 @@ def is_current_version_studio_latest(): expected_version = get_expected_version() # Check if current version is expected version return current_version == expected_version + + +def is_current_version_higher_than_expected(): + """Is current OpenPype version higher than version defined by studio. + + Returns: + None: Can't determine. e.g. when running from code or the build is + too old. + bool: True when is higher than studio version. + """ + output = None + # Skip if is not running from build or build does not support version + # control or path to folder with zip files is not accessible + if ( + not is_running_from_build() + or not op_version_control_available() + or not openpype_path_is_accessible() + ): + return output + + # Get OpenPypeVersion class + OpenPypeVersion = get_OpenPypeVersion() + # Convert current version to OpenPypeVersion object + current_version = OpenPypeVersion(version=get_openpype_version()) + + # Get expected version (from settings) + expected_version = get_expected_version() + # Check if current version is expected version + return current_version > expected_version diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py index 4abf0f5a83..a6ce5d3a89 100644 --- a/openpype/tools/tray/pype_tray.py +++ b/openpype/tools/tray/pype_tray.py @@ -18,6 +18,7 @@ from openpype.lib import ( get_openpype_execute_args, op_version_control_available, is_current_version_studio_latest, + is_current_version_higher_than_expected, is_running_from_build, is_running_staging, get_expected_version, @@ -104,13 +105,12 @@ class VersionDialog(QtWidgets.QDialog): label_widget.setWordWrap(True) top_layout = QtWidgets.QHBoxLayout(top_widget) - # top_layout.setContentsMargins(0, 0, 0, 0) top_layout.setSpacing(10) top_layout.addWidget(gift_icon_label, 0, QtCore.Qt.AlignCenter) top_layout.addWidget(label_widget, 1) - ignore_btn = QtWidgets.QPushButton("Later", self) - restart_btn = QtWidgets.QPushButton("Restart && Update", self) + ignore_btn = QtWidgets.QPushButton(self) + restart_btn = QtWidgets.QPushButton(self) restart_btn.setObjectName("TrayRestartButton") btns_layout = QtWidgets.QHBoxLayout() @@ -127,7 +127,12 @@ class VersionDialog(QtWidgets.QDialog): restart_btn.clicked.connect(self._on_reset) self._label_widget = label_widget + self._gift_icon_label = gift_icon_label + self._ignore_btn = ignore_btn + self._restart_btn = restart_btn + self._restart_accepted = False + self._current_is_higher = False self.setStyleSheet(style.load_stylesheet()) @@ -152,15 +157,37 @@ class VersionDialog(QtWidgets.QDialog): def closeEvent(self, event): super().closeEvent(event) - if not self._restart_accepted: - self.ignore_requested.emit() + if self._restart_accepted or self._current_is_higher: + return + # Trigger ignore requested only if restart was not clicked and current + # version is lower + self.ignore_requested.emit() - def update_versions(self, current_version, expected_version): - message = ( - "Running OpenPype version is {}." - " Your production has been updated to version {}." - ).format(str(current_version), str(expected_version)) - self._label_widget.setText(message) + def update_versions( + self, current_version, expected_version, current_is_higher + ): + if not current_is_higher: + label_message = ( + "Running OpenPype version is {}." + " Your production has been updated to version {}." + ).format(str(current_version), str(expected_version)) + ignore_label = "Later" + restart_label = "Restart && Update" + else: + label_message = ( + "Running OpenPype version is {}." + " Your production should use version {}." + ).format(str(current_version), str(expected_version)) + ignore_label = "I know" + restart_label = "Restart && Change" + + self._current_is_higher = current_is_higher + + self._gift_icon_label.setVisible(not current_is_higher) + + self._label_widget.setText(label_message) + self._ignore_btn.setText(ignore_label) + self._restart_btn.setText(restart_label) def _on_ignore(self): self.reject() @@ -247,15 +274,17 @@ class TrayManager: expected_version = get_expected_version() current_version = get_openpype_version() + current_is_higher = is_current_version_higher_than_expected() + self._version_dialog.update_versions( - current_version, expected_version + current_version, expected_version, current_is_higher ) self._version_dialog.show() self._version_dialog.raise_() self._version_dialog.activateWindow() def _restart_and_install(self): - self.restart() + self.restart(use_expected_version=True) def _outdated_version_ignored(self): self.show_tray_message( @@ -432,12 +461,18 @@ class TrayManager: self._restart_action = restart_action def _on_restart_action(self): - self.restart() + self.restart(use_expected_version=True) - def restart(self, reset_version=True): + def restart(self, use_expected_version=False, reset_version=False): """Restart Tray tool. First creates new process with same argument and close current tray. + + Args: + use_expected_version(bool): OpenPype version is set to expected + version. + reset_version(bool): OpenPype version is cleaned up so igniters + logic will decide which version will be used. """ args = get_openpype_execute_args() kwargs = { @@ -451,6 +486,15 @@ class TrayManager: if args[-1] == additional_args[0]: additional_args.pop(0) + if use_expected_version: + expected_version = get_expected_version() + if expected_version is not None: + reset_version = False + kwargs["env"]["OPENPYPE_VERSION"] = str(expected_version) + else: + # Trigger reset of version if expected version was not found + reset_version = True + # Pop OPENPYPE_VERSION if reset_version: # Add staging flag if was running from staging From 2a848bbb97c061205eead8dde7e4a95261494cc5 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 21 Jan 2022 12:25:09 +0100 Subject: [PATCH 073/123] change title --- openpype/tools/tray/pype_tray.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py index a6ce5d3a89..1fd4b3ae97 100644 --- a/openpype/tools/tray/pype_tray.py +++ b/openpype/tools/tray/pype_tray.py @@ -85,7 +85,7 @@ class VersionDialog(QtWidgets.QDialog): def __init__(self, parent=None): super(VersionDialog, self).__init__(parent) - self.setWindowTitle("OpenPype update is needed") + icon = QtGui.QIcon(resources.get_openpype_icon_filepath()) self.setWindowIcon(icon) self.setWindowFlags( @@ -167,6 +167,7 @@ class VersionDialog(QtWidgets.QDialog): self, current_version, expected_version, current_is_higher ): if not current_is_higher: + title = "OpenPype update is needed" label_message = ( "Running OpenPype version is {}." " Your production has been updated to version {}." @@ -174,6 +175,7 @@ class VersionDialog(QtWidgets.QDialog): ignore_label = "Later" restart_label = "Restart && Update" else: + title = "OpenPype version is higher" label_message = ( "Running OpenPype version is {}." " Your production should use version {}." @@ -181,6 +183,8 @@ class VersionDialog(QtWidgets.QDialog): ignore_label = "I know" restart_label = "Restart && Change" + self.setWindowTitle(title) + self._current_is_higher = current_is_higher self._gift_icon_label.setVisible(not current_is_higher) From 69dea46dccaa79860aa4eb1cf4068ef93cf9f5a5 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 21 Jan 2022 12:41:11 +0100 Subject: [PATCH 074/123] removed 'should' from label --- openpype/tools/tray/pype_tray.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py index 1fd4b3ae97..284a6a31df 100644 --- a/openpype/tools/tray/pype_tray.py +++ b/openpype/tools/tray/pype_tray.py @@ -178,7 +178,7 @@ class VersionDialog(QtWidgets.QDialog): title = "OpenPype version is higher" label_message = ( "Running OpenPype version is {}." - " Your production should use version {}." + " Your production use version {}." ).format(str(current_version), str(expected_version)) ignore_label = "I know" restart_label = "Restart && Change" From aedfb53c4e1e4851726671d3b519101c5984c639 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 21 Jan 2022 13:22:14 +0100 Subject: [PATCH 075/123] fix grammar --- openpype/tools/tray/pype_tray.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py index 284a6a31df..4ad5bc19ba 100644 --- a/openpype/tools/tray/pype_tray.py +++ b/openpype/tools/tray/pype_tray.py @@ -178,7 +178,7 @@ class VersionDialog(QtWidgets.QDialog): title = "OpenPype version is higher" label_message = ( "Running OpenPype version is {}." - " Your production use version {}." + " Your production uses version {}." ).format(str(current_version), str(expected_version)) ignore_label = "I know" restart_label = "Restart && Change" From 469d58a15b1e554886dbe0f096e8cb685d1b120e Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 21 Jan 2022 16:49:25 +0100 Subject: [PATCH 076/123] Fix - removed obsolete import --- openpype/hosts/aftereffects/plugins/publish/collect_render.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/hosts/aftereffects/plugins/publish/collect_render.py b/openpype/hosts/aftereffects/plugins/publish/collect_render.py index cd67f8ca9e..5b713f43a2 100644 --- a/openpype/hosts/aftereffects/plugins/publish/collect_render.py +++ b/openpype/hosts/aftereffects/plugins/publish/collect_render.py @@ -3,7 +3,6 @@ import re import tempfile import attr -from avalon import aftereffects import pyblish.api from openpype.settings import get_project_settings From 70927e7d33b01a60410d24666ef640f8434e0d10 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Fri, 21 Jan 2022 17:48:47 +0100 Subject: [PATCH 077/123] fixed deadline handling --- .../maya/plugins/create/create_vrayscene.py | 150 ++++++++++++++---- .../maya/plugins/publish/collect_vrayscene.py | 2 +- 2 files changed, 122 insertions(+), 30 deletions(-) diff --git a/openpype/hosts/maya/plugins/create/create_vrayscene.py b/openpype/hosts/maya/plugins/create/create_vrayscene.py index f9d3c7b8f0..5ce829b452 100644 --- a/openpype/hosts/maya/plugins/create/create_vrayscene.py +++ b/openpype/hosts/maya/plugins/create/create_vrayscene.py @@ -4,6 +4,8 @@ import os import json import appdirs import requests +import six +import sys from maya import cmds import maya.app.renderSetup.model.renderSetup as renderSetup @@ -12,7 +14,15 @@ from openpype.hosts.maya.api import ( lib, plugin ) -from openpype.api import get_system_settings +from openpype.api import ( + get_system_settings, + get_project_settings, + get_asset) + +from openpype.modules import ModulesManager + +from avalon.api import Session +from avalon.api import CreatorError class CreateVRayScene(plugin.Creator): @@ -22,11 +32,40 @@ class CreateVRayScene(plugin.Creator): family = "vrayscene" icon = "cubes" + _project_settings = None + def __init__(self, *args, **kwargs): """Entry.""" super(CreateVRayScene, self).__init__(*args, **kwargs) self._rs = renderSetup.instance() self.data["exportOnFarm"] = False + deadline_settings = get_system_settings()["modules"]["deadline"] + if not deadline_settings["enabled"]: + self.deadline_servers = {} + return + self._project_settings = get_project_settings( + Session["AVALON_PROJECT"]) + + try: + default_servers = deadline_settings["deadline_urls"] + project_servers = ( + self._project_settings["deadline"]["deadline_servers"] + ) + self.deadline_servers = { + k: default_servers[k] + for k in project_servers + if k in default_servers + } + + if not self.deadline_servers: + self.deadline_servers = default_servers + + except AttributeError: + # Handle situation were we had only one url for deadline. + manager = ModulesManager() + deadline_module = manager.modules_by_name["deadline"] + # get default deadline webservice url from deadline module + self.deadline_servers = deadline_module.deadline_urls def process(self): """Entry point.""" @@ -37,10 +76,10 @@ class CreateVRayScene(plugin.Creator): use_selection = self.options.get("useSelection") with lib.undo_chunk(): self._create_vray_instance_settings() - instance = super(CreateVRayScene, self).process() + self.instance = super(CreateVRayScene, self).process() index = 1 - namespace_name = "_{}".format(str(instance)) + namespace_name = "_{}".format(str(self.instance)) try: cmds.namespace(rm=namespace_name) except RuntimeError: @@ -48,10 +87,19 @@ class CreateVRayScene(plugin.Creator): pass while(cmds.namespace(exists=namespace_name)): - namespace_name = "_{}{}".format(str(instance), index) + namespace_name = "_{}{}".format(str(self.instance), index) index += 1 namespace = cmds.namespace(add=namespace_name) + + # add Deadline server selection list + if self.deadline_servers: + cmds.scriptJob( + attributeChange=[ + "{}.deadlineServers".format(self.instance), + self._deadline_webservice_changed + ]) + # create namespace with instance layers = self._rs.getRenderLayers() if use_selection: @@ -62,7 +110,7 @@ class CreateVRayScene(plugin.Creator): render_set = cmds.sets( n="{}:{}".format(namespace, layer.name())) sets.append(render_set) - cmds.sets(sets, forceElement=instance) + cmds.sets(sets, forceElement=self.instance) # if no render layers are present, create default one with # asterix selector @@ -71,6 +119,52 @@ class CreateVRayScene(plugin.Creator): collection = render_layer.createCollection("defaultCollection") collection.getSelector().setPattern('*') + def _deadline_webservice_changed(self): + """Refresh Deadline server dependent options.""" + # get selected server + from maya import cmds + webservice = self.deadline_servers[ + self.server_aliases[ + cmds.getAttr("{}.deadlineServers".format(self.instance)) + ] + ] + pools = self._get_deadline_pools(webservice) + cmds.deleteAttr("{}.primaryPool".format(self.instance)) + cmds.deleteAttr("{}.secondaryPool".format(self.instance)) + cmds.addAttr(self.instance, longName="primaryPool", + attributeType="enum", + enumName=":".join(pools)) + cmds.addAttr(self.instance, longName="secondaryPool", + attributeType="enum", + enumName=":".join(["-"] + pools)) + + def _get_deadline_pools(self, webservice): + # type: (str) -> list + """Get pools from Deadline. + Args: + webservice (str): Server url. + Returns: + list: Pools. + Throws: + RuntimeError: If deadline webservice is unreachable. + + """ + argument = "{}/api/pools?NamesOnly=true".format(webservice) + try: + response = self._requests_get(argument) + except requests.exceptions.ConnectionError as exc: + msg = 'Cannot connect to deadline web service' + self.log.error(msg) + six.reraise( + CreatorError, + CreatorError('{} - {}'.format(msg, exc)), + sys.exc_info()[2]) + if not response.ok: + self.log.warning("No pools retrieved") + return [] + + return response.json() + def _create_vray_instance_settings(self): # get pools pools = [] @@ -79,31 +173,29 @@ class CreateVRayScene(plugin.Creator): deadline_enabled = system_settings["deadline"]["enabled"] muster_enabled = system_settings["muster"]["enabled"] - deadline_url = system_settings["deadline"]["DEADLINE_REST_URL"] muster_url = system_settings["muster"]["MUSTER_REST_URL"] if deadline_enabled and muster_enabled: self.log.error( "Both Deadline and Muster are enabled. " "Cannot support both." ) - raise RuntimeError("Both Deadline and Muster are enabled") + raise CreatorError("Both Deadline and Muster are enabled") + + self.server_aliases = self.deadline_servers.keys() + self.data["deadlineServers"] = self.server_aliases if deadline_enabled: - argument = "{}/api/pools?NamesOnly=true".format(deadline_url) + # if default server is not between selected, use first one for + # initial list of pools. try: - response = self._requests_get(argument) - except requests.exceptions.ConnectionError as e: - msg = 'Cannot connect to deadline web service' - self.log.error(msg) - raise RuntimeError('{} - {}'.format(msg, e)) - if not response.ok: - self.log.warning("No pools retrieved") - else: - pools = response.json() - self.data["primaryPool"] = pools - # We add a string "-" to allow the user to not - # set any secondary pools - self.data["secondaryPool"] = ["-"] + pools + deadline_url = self.deadline_servers["default"] + except KeyError: + deadline_url = [ + self.deadline_servers[k] + for k in self.deadline_servers.keys() + ][0] + + pool_names = self._get_deadline_pools(deadline_url) if muster_enabled: self.log.info(">>> Loading Muster credentials ...") @@ -115,10 +207,10 @@ class CreateVRayScene(plugin.Creator): if e.startswith("401"): self.log.warning("access token expired") self._show_login() - raise RuntimeError("Access token expired") + raise CreatorError("Access token expired") except requests.exceptions.ConnectionError: self.log.error("Cannot connect to Muster API endpoint.") - raise RuntimeError("Cannot connect to {}".format(muster_url)) + raise CreatorError("Cannot connect to {}".format(muster_url)) pool_names = [] for pool in pools: self.log.info(" - pool: {}".format(pool["name"])) @@ -140,7 +232,7 @@ class CreateVRayScene(plugin.Creator): ``MUSTER_PASSWORD``, ``MUSTER_REST_URL`` is loaded from presets. Raises: - RuntimeError: If loaded credentials are invalid. + CreatorError: If loaded credentials are invalid. AttributeError: If ``MUSTER_REST_URL`` is not set. """ @@ -152,7 +244,7 @@ class CreateVRayScene(plugin.Creator): self._token = muster_json.get("token", None) if not self._token: self._show_login() - raise RuntimeError("Invalid access token for Muster") + raise CreatorError("Invalid access token for Muster") file.close() self.MUSTER_REST_URL = os.environ.get("MUSTER_REST_URL") if not self.MUSTER_REST_URL: @@ -162,7 +254,7 @@ class CreateVRayScene(plugin.Creator): """Get render pools from Muster. Raises: - Exception: If pool list cannot be obtained from Muster. + CreatorError: If pool list cannot be obtained from Muster. """ params = {"authToken": self._token} @@ -178,12 +270,12 @@ class CreateVRayScene(plugin.Creator): ("Cannot get pools from " "Muster: {}").format(response.status_code) ) - raise Exception("Cannot get pools from Muster") + raise CreatorError("Cannot get pools from Muster") try: pools = response.json()["ResponseData"]["pools"] except ValueError as e: self.log.error("Invalid response from Muster server {}".format(e)) - raise Exception("Invalid response from Muster server") + raise CreatorError("Invalid response from Muster server") return pools @@ -196,7 +288,7 @@ class CreateVRayScene(plugin.Creator): login_response = self._requests_get(api_url, timeout=1) if login_response.status_code != 200: self.log.error("Cannot show login form to Muster") - raise Exception("Cannot show login form to Muster") + raise CreatorError("Cannot show login form to Muster") def _requests_post(self, *args, **kwargs): """Wrap request post method. diff --git a/openpype/hosts/maya/plugins/publish/collect_vrayscene.py b/openpype/hosts/maya/plugins/publish/collect_vrayscene.py index e5c182c908..c1e5d388af 100644 --- a/openpype/hosts/maya/plugins/publish/collect_vrayscene.py +++ b/openpype/hosts/maya/plugins/publish/collect_vrayscene.py @@ -7,7 +7,7 @@ from maya import cmds import pyblish.api from avalon import api -from openpype.hosts.maya import lib +from openpype.hosts.maya.api import lib class CollectVrayScene(pyblish.api.InstancePlugin): From ba6452c37e6bfc693297634ed8fde3da5ec5952a Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Fri, 21 Jan 2022 18:15:10 +0100 Subject: [PATCH 078/123] remove unused imports --- openpype/hosts/maya/plugins/create/create_vrayscene.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/maya/plugins/create/create_vrayscene.py b/openpype/hosts/maya/plugins/create/create_vrayscene.py index 5ce829b452..f2096d902e 100644 --- a/openpype/hosts/maya/plugins/create/create_vrayscene.py +++ b/openpype/hosts/maya/plugins/create/create_vrayscene.py @@ -16,8 +16,8 @@ from openpype.hosts.maya.api import ( ) from openpype.api import ( get_system_settings, - get_project_settings, - get_asset) + get_project_settings +) from openpype.modules import ModulesManager From a06b13604f3f2bd9fa51efc98c6d809eec610dae Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 21 Jan 2022 18:39:35 +0100 Subject: [PATCH 079/123] handle situations when version can't be detected --- openpype/tools/tray/pype_tray.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py index 4ad5bc19ba..a21a9de705 100644 --- a/openpype/tools/tray/pype_tray.py +++ b/openpype/tools/tray/pype_tray.py @@ -258,6 +258,10 @@ class TrayManager: def validate_openpype_version(self): using_requested = is_current_version_studio_latest() + # TODO Handle situations when version can't be detected + if using_requested is None: + using_requested = True + self._restart_action.setVisible(not using_requested) if using_requested: if ( From c78eafa8eb1217a89af473bbe7b7fd93ab6291a2 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 21 Jan 2022 18:48:59 +0100 Subject: [PATCH 080/123] changed order of version settings in UI --- .../defaults/system_settings/general.json | 8 +- .../schemas/system_schema/schema_general.json | 79 ++++++++++--------- .../settings/settings/wrapper_widgets.py | 3 +- 3 files changed, 48 insertions(+), 42 deletions(-) diff --git a/openpype/settings/defaults/system_settings/general.json b/openpype/settings/defaults/system_settings/general.json index 7c78de9a5c..5a3e39e5b6 100644 --- a/openpype/settings/defaults/system_settings/general.json +++ b/openpype/settings/defaults/system_settings/general.json @@ -2,9 +2,6 @@ "studio_name": "Studio name", "studio_code": "stu", "admin_password": "", - "production_version": "", - "staging_version": "", - "version_check_interval": 5, "environment": { "__environment_keys__": { "global": [] @@ -19,5 +16,8 @@ "windows": [], "darwin": [], "linux": [] - } + }, + "production_version": "", + "staging_version": "", + "version_check_interval": 5 } \ No newline at end of file diff --git a/openpype/settings/entities/schemas/system_schema/schema_general.json b/openpype/settings/entities/schemas/system_schema/schema_general.json index 3af3f5ce35..6306317df8 100644 --- a/openpype/settings/entities/schemas/system_schema/schema_general.json +++ b/openpype/settings/entities/schemas/system_schema/schema_general.json @@ -30,36 +30,6 @@ { "type": "splitter" }, - { - "type": "label", - "label": "Define explicit OpenPype version that should be used. Keep empty to use latest available version." - }, - { - "type": "production-versions-text", - "key": "production_version", - "label": "Production version" - }, - { - "type": "staging-versions-text", - "key": "staging_version", - "label": "Staging version" - }, - { - "type": "splitter" - }, - { - "type": "label", - "label": "Trigger validation if running OpenPype is using studio defined version each 'n' minutes. Validation happens in OpenPype tray application." - }, - { - "type": "number", - "key": "version_check_interval", - "label": "Version check interval", - "minimum": 0 - }, - { - "type": "splitter" - }, { "key": "environment", "label": "Environment", @@ -141,12 +111,49 @@ "type": "splitter" }, { - "type": "path", - "key": "openpype_path", - "label": "Versions Repository", - "multiplatform": true, - "multipath": true, - "require_restart": true + "type": "collapsible-wrap", + "label": "OpenPype deployment control", + "collapsible": false, + "children": [ + { + "type": "path", + "key": "openpype_path", + "label": "Versions Repository", + "multiplatform": true, + "multipath": true, + "require_restart": true + }, + { + "type": "splitter" + }, + { + "type": "label", + "label": "Define explicit OpenPype version that should be used. Keep empty to use latest available version." + }, + { + "type": "production-versions-text", + "key": "production_version", + "label": "Production version" + }, + { + "type": "staging-versions-text", + "key": "staging_version", + "label": "Staging version" + }, + { + "type": "splitter" + }, + { + "type": "label", + "label": "Trigger validation if running OpenPype is using studio defined version each 'n' minutes. Validation happens in OpenPype tray application." + }, + { + "type": "number", + "key": "version_check_interval", + "label": "Version check interval", + "minimum": 0 + } + ] } ] } diff --git a/openpype/tools/settings/settings/wrapper_widgets.py b/openpype/tools/settings/settings/wrapper_widgets.py index b14a226912..7370fcf945 100644 --- a/openpype/tools/settings/settings/wrapper_widgets.py +++ b/openpype/tools/settings/settings/wrapper_widgets.py @@ -92,8 +92,7 @@ class CollapsibleWrapper(WrapperWidget): self.content_layout = content_layout if self.collapsible: - if not self.collapsed: - body_widget.toggle_content() + body_widget.toggle_content(self.collapsed) else: body_widget.hide_toolbox(hide_content=False) From 83204dde615ae723e1df7e15bc4b45ddf4a1a9ca Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 21 Jan 2022 19:08:54 +0100 Subject: [PATCH 081/123] added OpenPype deployment control to website docs --- website/docs/admin_settings_system.md | 21 +++++++++++++++++- .../settings/settings_system_general.png | Bin 33586 -> 45859 bytes .../settings_system_version_downgrade.png | Bin 0 -> 7777 bytes .../settings_system_version_update.png | Bin 0 -> 8435 bytes 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 website/docs/assets/settings/settings_system_version_downgrade.png create mode 100644 website/docs/assets/settings/settings_system_version_update.png diff --git a/website/docs/admin_settings_system.md b/website/docs/admin_settings_system.md index 6057ed0830..78be9fb01e 100644 --- a/website/docs/admin_settings_system.md +++ b/website/docs/admin_settings_system.md @@ -11,6 +11,8 @@ import TabItem from '@theme/TabItem'; Settings applicable to the full studio. +![general_settings](assets/settings/settings_system_general.png) + **`Studio Name`** - Full name of the studio (can be used as variable on some places) **`Studio Code`** - Studio acronym or a short code (can be used as variable on some places) @@ -24,10 +26,27 @@ as a naive barier to prevent artists from accidental setting changes. **`Disk mapping`** - Platform dependent configuration for mapping of virtual disk(s) on an artist's OpenPype machines before OP starts up. Uses `subst` command, if configured volume character in `Destination` field already exists, no re-mapping is done for that character(volume). +### OpenPype deployment control **`Versions Repository`** - Location where automatic update mechanism searches for zip files with OpenPype update packages. To read more about preparing OpenPype for automatic updates go to [Admin Distribute docs](admin_distribute#2-openpype-codebase) -![general_settings](assets/settings/settings_system_general.png) +**`Production version`** - Define what is current production version. When value is not set then latest version available in versions repository is resolved as production version. + +**`Staging version`** - Define what is current staging version. When value is not set then latest staging version available in versions repository is resolved as staging version. + +For more information about Production and Staging go to [Distribute](admin_distribute#staging-vs-production). + +**Production version** and **Staging version** fields will define which version will be used in studio. Filling explicit version will force new OpenPype processes to use it. That gives more control over studio deployment especially when some workstations don't have access to version repository (e.g. remote users). It can be also used to downgrade studio version when newer version have production breaking bug. + +When fields are not filled the latest version in versions repository is used as studio version. That makes updating easier as it is not needed to modify settings but workstations without access to versions repository can't find out which OpenPype version should be used. + +If version repository is not set or is not accessible for workstation the latest available version on workstation is used or version inside build. + +**`Version check interval`** - OpenPype tray application check if currently used OpenPype version is up to date with production/staging version. It is possible to modify how often the validation is triggered in minutes. It is possible to set the interval to `0`. That will turn off version validations but it is not recommend. + +A dialog asking for restart is shown when OpenPype tray application detect that different version should be used. +![general_settings](assets/settings/settings_system_version_update.png) +![general_settings](assets/settings/settings_system_version_downgrade.png) ## Modules diff --git a/website/docs/assets/settings/settings_system_general.png b/website/docs/assets/settings/settings_system_general.png index d04586205d24ee30445a80ce54330b2c3c03e77c..a2a684caeab6ce6538e8b7a5d8aaf2e76dfe902b 100644 GIT binary patch literal 45859 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 diff --git a/website/docs/assets/settings/settings_system_version_downgrade.png b/website/docs/assets/settings/settings_system_version_downgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..277f2c6bc89a2f565c265e311a233b55d12fba01 GIT binary patch literal 7777 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 QY7;;gYN%DDVgKqs0NafSyZ`_I literal 0 HcmV?d00001 diff --git a/website/docs/assets/settings/settings_system_version_update.png b/website/docs/assets/settings/settings_system_version_update.png new file mode 100644 index 0000000000000000000000000000000000000000..50adbab1736700d433ff8627900152627cc5cd4f GIT binary patch literal 8435 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 Date: Sat, 22 Jan 2022 03:38:16 +0000 Subject: [PATCH 082/123] [Automated] Bump version --- CHANGELOG.md | 72 ++++++++++++++++++--------------------------- openpype/version.py | 2 +- pyproject.toml | 2 +- 3 files changed, 31 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1b390da5e..bffbc69931 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [3.8.0-nightly.5](https://github.com/pypeclub/OpenPype/tree/HEAD) +## [3.8.0-nightly.6](https://github.com/pypeclub/OpenPype/tree/HEAD) [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.7.0...HEAD) @@ -11,52 +11,57 @@ **🆕 New features** -- Flame: OpenTimelineIO Export Modul [\#2398](https://github.com/pypeclub/OpenPype/pull/2398) +- Flame: collecting publishable instances [\#2519](https://github.com/pypeclub/OpenPype/pull/2519) +- Flame: create publishable clips [\#2495](https://github.com/pypeclub/OpenPype/pull/2495) **🚀 Enhancements** +- Webpublisher: Moved error at the beginning of the log [\#2559](https://github.com/pypeclub/OpenPype/pull/2559) +- Ftrack: Use ApplicationManager to get DJV path [\#2558](https://github.com/pypeclub/OpenPype/pull/2558) +- Webpublisher: Added endpoint to reprocess batch through UI [\#2555](https://github.com/pypeclub/OpenPype/pull/2555) - Settings: PathInput strip passed string [\#2550](https://github.com/pypeclub/OpenPype/pull/2550) +- Global: Exctract Review anatomy fill data with output name [\#2548](https://github.com/pypeclub/OpenPype/pull/2548) +- Flame: extracting segments with trans-coding [\#2547](https://github.com/pypeclub/OpenPype/pull/2547) +- Cosmetics: Clean up some cosmetics / typos [\#2542](https://github.com/pypeclub/OpenPype/pull/2542) - General: Validate if current process OpenPype version is requested version [\#2529](https://github.com/pypeclub/OpenPype/pull/2529) - General: Be able to use anatomy data in ffmpeg output arguments [\#2525](https://github.com/pypeclub/OpenPype/pull/2525) - Expose toggle publish plug-in settings for Maya Look Shading Engine Naming [\#2521](https://github.com/pypeclub/OpenPype/pull/2521) - Photoshop: Move implementation to OpenPype [\#2510](https://github.com/pypeclub/OpenPype/pull/2510) - TimersManager: Move module one hierarchy higher [\#2501](https://github.com/pypeclub/OpenPype/pull/2501) - Slack: notifications are sent with Openpype logo and bot name [\#2499](https://github.com/pypeclub/OpenPype/pull/2499) -- Ftrack: Event handlers settings [\#2496](https://github.com/pypeclub/OpenPype/pull/2496) -- Flame - create publishable clips [\#2495](https://github.com/pypeclub/OpenPype/pull/2495) -- Tools: Fix style and modality of errors in loader and creator [\#2489](https://github.com/pypeclub/OpenPype/pull/2489) - Project Manager: Remove project button cleanup [\#2482](https://github.com/pypeclub/OpenPype/pull/2482) -- Tools: Be able to change models of tasks and assets widgets [\#2475](https://github.com/pypeclub/OpenPype/pull/2475) -- Publish pype: Reduce publish process defering [\#2464](https://github.com/pypeclub/OpenPype/pull/2464) -- Maya: Improve speed of Collect History logic [\#2460](https://github.com/pypeclub/OpenPype/pull/2460) -- Maya: Validate Rig Controllers - fix Error: in script editor [\#2459](https://github.com/pypeclub/OpenPype/pull/2459) -- Maya: Optimize Validate Locked Normals speed for dense polymeshes [\#2457](https://github.com/pypeclub/OpenPype/pull/2457) -- Fix \#2453 Refactor missing \_get\_reference\_node method [\#2455](https://github.com/pypeclub/OpenPype/pull/2455) +- Maya: Refactor missing \_get\_reference\_node method [\#2455](https://github.com/pypeclub/OpenPype/pull/2455) - Houdini: Remove broken unique name counter [\#2450](https://github.com/pypeclub/OpenPype/pull/2450) - Maya: Improve lib.polyConstraint performance when Select tool is not the active tool context [\#2447](https://github.com/pypeclub/OpenPype/pull/2447) - General: Validate third party before build [\#2425](https://github.com/pypeclub/OpenPype/pull/2425) -- Maya : add option to not group reference in ReferenceLoader [\#2383](https://github.com/pypeclub/OpenPype/pull/2383) **🐛 Bug fixes** +- AfterEffects: Fix - removed obsolete import [\#2577](https://github.com/pypeclub/OpenPype/pull/2577) +- Ftrack: Delete action revision [\#2563](https://github.com/pypeclub/OpenPype/pull/2563) +- Webpublisher: ftrack shows incorrect user names [\#2560](https://github.com/pypeclub/OpenPype/pull/2560) +- General: Do not validate version if build does not support it [\#2557](https://github.com/pypeclub/OpenPype/pull/2557) +- Webpublisher: Fixed progress reporting [\#2553](https://github.com/pypeclub/OpenPype/pull/2553) +- Fix Maya AssProxyLoader version switch [\#2551](https://github.com/pypeclub/OpenPype/pull/2551) +- General: Fix install thread in igniter [\#2549](https://github.com/pypeclub/OpenPype/pull/2549) +- Houdini: vdbcache family preserve frame numbers on publish integration + enable validate version for Houdini [\#2535](https://github.com/pypeclub/OpenPype/pull/2535) +- Maya: Fix Load VDB to V-Ray [\#2533](https://github.com/pypeclub/OpenPype/pull/2533) +- Fix create zip tool - path argument [\#2522](https://github.com/pypeclub/OpenPype/pull/2522) +- Maya: Fix Extract Look with space in names [\#2518](https://github.com/pypeclub/OpenPype/pull/2518) - Fix published frame content for sequence starting with 0 [\#2513](https://github.com/pypeclub/OpenPype/pull/2513) -- Fix \#2497: reset empty string attributes correctly to "" instead of "None" [\#2506](https://github.com/pypeclub/OpenPype/pull/2506) -- General: Settings work if OpenPypeVersion is available [\#2494](https://github.com/pypeclub/OpenPype/pull/2494) -- General: PYTHONPATH may break OpenPype dependencies [\#2493](https://github.com/pypeclub/OpenPype/pull/2493) -- Workfiles tool: Files widget show files on first show [\#2488](https://github.com/pypeclub/OpenPype/pull/2488) -- General: Custom template paths filter fix [\#2483](https://github.com/pypeclub/OpenPype/pull/2483) -- Loader: Remove always on top flag in tray [\#2480](https://github.com/pypeclub/OpenPype/pull/2480) -- General: Anatomy does not return root envs as unicode [\#2465](https://github.com/pypeclub/OpenPype/pull/2465) +- Maya: reset empty string attributes correctly to "" instead of "None" [\#2506](https://github.com/pypeclub/OpenPype/pull/2506) +- Improve FusionPreLaunch hook errors [\#2505](https://github.com/pypeclub/OpenPype/pull/2505) - Maya: Validate Shape Zero do not keep fixed geometry vertices selected/active after repair [\#2456](https://github.com/pypeclub/OpenPype/pull/2456) **Merged pull requests:** -- General: Fix install thread in igniter [\#2549](https://github.com/pypeclub/OpenPype/pull/2549) - AfterEffects: Move implementation to OpenPype [\#2543](https://github.com/pypeclub/OpenPype/pull/2543) -- Fix create zip tool - path argument [\#2522](https://github.com/pypeclub/OpenPype/pull/2522) -- General: Modules import function output fix [\#2492](https://github.com/pypeclub/OpenPype/pull/2492) -- AE: fix hiding of alert window below Publish [\#2491](https://github.com/pypeclub/OpenPype/pull/2491) -- Maya: Validate NGONs re-use polyConstraint code from openpype.host.maya.api.lib [\#2458](https://github.com/pypeclub/OpenPype/pull/2458) +- Maya: Remove Maya Look Assigner check on startup [\#2540](https://github.com/pypeclub/OpenPype/pull/2540) +- build\(deps\): bump shelljs from 0.8.4 to 0.8.5 in /website [\#2538](https://github.com/pypeclub/OpenPype/pull/2538) +- build\(deps\): bump follow-redirects from 1.14.4 to 1.14.7 in /website [\#2534](https://github.com/pypeclub/OpenPype/pull/2534) +- Maya: ReferenceLoader fix not unique group name error for attach to root [\#2532](https://github.com/pypeclub/OpenPype/pull/2532) +- Maya: namespaced context go back to original namespace when started from inside a namespace [\#2531](https://github.com/pypeclub/OpenPype/pull/2531) +- Nuke: Merge avalon's implementation into OpenPype [\#2514](https://github.com/pypeclub/OpenPype/pull/2514) ## [3.7.0](https://github.com/pypeclub/OpenPype/tree/3.7.0) (2022-01-04) @@ -72,14 +77,6 @@ - Modules: JobQueue module moved one hierarchy level higher [\#2419](https://github.com/pypeclub/OpenPype/pull/2419) - TimersManager: Start timer post launch hook [\#2418](https://github.com/pypeclub/OpenPype/pull/2418) - General: Run applications as separate processes under linux [\#2408](https://github.com/pypeclub/OpenPype/pull/2408) -- Ftrack: Check existence of object type on recreation [\#2404](https://github.com/pypeclub/OpenPype/pull/2404) -- Enhancement: Global cleanup plugin that explicitly remove paths from context [\#2402](https://github.com/pypeclub/OpenPype/pull/2402) -- General: MongoDB ability to specify replica set groups [\#2401](https://github.com/pypeclub/OpenPype/pull/2401) -- Flame: moving `utility\_scripts` to api folder also with `scripts` [\#2385](https://github.com/pypeclub/OpenPype/pull/2385) -- Centos 7 dependency compatibility [\#2384](https://github.com/pypeclub/OpenPype/pull/2384) -- Enhancement: Settings: Use project settings values from another project [\#2382](https://github.com/pypeclub/OpenPype/pull/2382) -- Blender 3: Support auto install for new blender version [\#2377](https://github.com/pypeclub/OpenPype/pull/2377) -- Maya add render image path to settings [\#2375](https://github.com/pypeclub/OpenPype/pull/2375) **🐛 Bug fixes** @@ -89,21 +86,10 @@ - Settings UI: Breadcrumbs path does not create new entities [\#2416](https://github.com/pypeclub/OpenPype/pull/2416) - AfterEffects: Variant 2022 is in defaults but missing in schemas [\#2412](https://github.com/pypeclub/OpenPype/pull/2412) - Nuke: baking representations was not additive [\#2406](https://github.com/pypeclub/OpenPype/pull/2406) -- General: Fix access to environments from default settings [\#2403](https://github.com/pypeclub/OpenPype/pull/2403) -- Fix: Placeholder Input color set fix [\#2399](https://github.com/pypeclub/OpenPype/pull/2399) -- Settings: Fix state change of wrapper label [\#2396](https://github.com/pypeclub/OpenPype/pull/2396) -- Flame: fix ftrack publisher [\#2381](https://github.com/pypeclub/OpenPype/pull/2381) -- hiero: solve custom ocio path [\#2379](https://github.com/pypeclub/OpenPype/pull/2379) -- hiero: fix workio and flatten [\#2378](https://github.com/pypeclub/OpenPype/pull/2378) -- Nuke: fixing menu re-drawing during context change [\#2374](https://github.com/pypeclub/OpenPype/pull/2374) -- Webpublisher: Fix assignment of families of TVpaint instances [\#2373](https://github.com/pypeclub/OpenPype/pull/2373) **Merged pull requests:** - Forced cx\_freeze to include sqlite3 into build [\#2432](https://github.com/pypeclub/OpenPype/pull/2432) -- Maya: Replaced PATH usage with vendored oiio path for maketx utility [\#2405](https://github.com/pypeclub/OpenPype/pull/2405) -- \[Fix\]\[MAYA\] Handle message type attribute within CollectLook [\#2394](https://github.com/pypeclub/OpenPype/pull/2394) -- Add validator to check correct version of extension for PS and AE [\#2387](https://github.com/pypeclub/OpenPype/pull/2387) ## [3.6.4](https://github.com/pypeclub/OpenPype/tree/3.6.4) (2021-11-23) diff --git a/openpype/version.py b/openpype/version.py index 121bb01e8f..60e619d7c0 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.8.0-nightly.5" +__version__ = "3.8.0-nightly.6" diff --git a/pyproject.toml b/pyproject.toml index 04d48401ab..72152bd433 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "OpenPype" -version = "3.8.0-nightly.5" # OpenPype +version = "3.8.0-nightly.6" # OpenPype description = "Open VFX and Animation pipeline with support." authors = ["OpenPype Team "] license = "MIT License" From 75819418e2b464284c9552845e1c2d3486e6afb6 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sun, 23 Jan 2022 14:00:10 +0100 Subject: [PATCH 083/123] Add more missing families in template --- .../schemas/template_publish_families.json | 50 ++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/template_publish_families.json b/openpype/settings/entities/schemas/projects_schema/schemas/template_publish_families.json index b5e33e2cf9..f39ad31fbb 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/template_publish_families.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/template_publish_families.json @@ -10,23 +10,39 @@ "multiselection": "{multiselection}", "type": "enum", "enum_items": [ - {"action": "action"}, - {"animation": "animation"}, - {"audio": "audio"}, - {"camera": "camera"}, - {"editorial": "editorial"}, - {"layout": "layout"}, - {"look": "look"}, - {"mayaScene": "mayaScene"}, - {"model": "model"}, - {"pointcache": "pointcache"}, - {"reference": "reference"}, - {"render": "render"}, - {"review": "review"}, - {"rig": "rig"}, - {"setdress": "setdress"}, - {"workfile": "workfile"}, - {"xgen": "xgen"} + {"action": "action"}, + {"animation": "animation"}, + {"assembly": "assembly"}, + {"audio": "audio"}, + {"backgroundComp": "backgroundComp"}, + {"backgroundLayout": "backgroundLayout"}, + {"camera": "camera"}, + {"editorial": "editorial"}, + {"gizmo": "gizmo"}, + {"image": "image"}, + {"layout": "layout"}, + {"look": "look"}, + {"matchmove": "matchmove"}, + {"mayaScene": "mayaScene"}, + {"model": "model"}, + {"nukenodes": "nukenodes"}, + {"plate": "plate"}, + {"pointcache": "pointcache"}, + {"prerender": "prerender"}, + {"redshiftproxy": "redshiftproxy"}, + {"reference": "reference"}, + {"render": "render"}, + {"review": "review"}, + {"rig": "rig"}, + {"setdress": "setdress"}, + {"take": "take"}, + {"usdShade": "usdShade"}, + {"vdbcache": "vdbcache"}, + {"vrayproxy": "vrayproxy"}, + {"workfile": "workfile"}, + {"xgen": "xgen"}, + {"yetiRig": "yetiRig"}, + {"yeticache": "yeticache"} ] } ] From d5bae9c288221e0e1269cfa3c9eb0e77844ef19e Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sun, 23 Jan 2022 14:06:54 +0100 Subject: [PATCH 084/123] Remove descriptive label, remove (on)/(off) from `is_include` label --- .../projects_schema/schemas/schema_global_tools.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_tools.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_tools.json index 863ec7f979..f8c9482e5f 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_tools.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_tools.json @@ -269,11 +269,7 @@ { "type": "boolean", "key": "is_include", - "label": "Exclude (OFF) / Include (ON)" - }, - { - "type": "label", - "label": "Include: show selected families by default. Hides others by default.
Exclude: hide selected families by default. Shows others by default." + "label": "Exclude / Include" }, { "type": "template", From 708e6f11845b4f86bcbd9c6226cfc662e8c3a93e Mon Sep 17 00:00:00 2001 From: 2-REC Date: Mon, 24 Jan 2022 10:22:31 +0700 Subject: [PATCH 085/123] Variables exports --- tools/create_zip.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/create_zip.sh b/tools/create_zip.sh index 85ee18a839..46393f78b1 100755 --- a/tools/create_zip.sh +++ b/tools/create_zip.sh @@ -130,8 +130,8 @@ main () { fi echo -e "${BIGreen}>>>${RST} Generating zip from current sources ..." - PYTHONPATH="$openpype_root:$PYTHONPATH" - OPENPYPE_ROOT="$openpype_root" + export PYTHONPATH="$openpype_root:$PYTHONPATH" + export OPENPYPE_ROOT="$openpype_root" "$POETRY_HOME/bin/poetry" run python3 "$openpype_root/tools/create_zip.py" "$@" } From f0fcb1bfefd197cd00b694cc391565ff28d9be50 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Mon, 24 Jan 2022 09:40:08 +0100 Subject: [PATCH 086/123] add defaults --- .../defaults/project_anatomy/templates.json | 5 ++++ .../defaults/project_settings/global.json | 11 ++++++++ .../defaults/project_settings/maya.json | 27 ++++++++++--------- .../schemas/schema_anatomy_templates.json | 22 +++++++++++++++ 4 files changed, 52 insertions(+), 13 deletions(-) diff --git a/openpype/settings/defaults/project_anatomy/templates.json b/openpype/settings/defaults/project_anatomy/templates.json index 9a03b893bf..d46d449c77 100644 --- a/openpype/settings/defaults/project_anatomy/templates.json +++ b/openpype/settings/defaults/project_anatomy/templates.json @@ -27,5 +27,10 @@ "path": "{@folder}/{@file}" }, "delivery": {}, + "unreal": { + "folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}", + "file": "{subset}_{@version}<_{output}><.{@frame}>.{ext}", + "path": "{@folder}/{@file}" + }, "others": {} } \ No newline at end of file diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index 2169a62746..da0bd454f3 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -264,6 +264,17 @@ "task_types": [], "tasks": [], "template": "render{Task}{Variant}" + }, + { + "families": [ + "unrealStaticMesh" + ], + "hosts": [ + "maya" + ], + "task_types": [], + "tasks": [], + "template": "S_{asset}{variant}" } ] }, diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 67a7b84cdc..9490724ee8 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -46,6 +46,20 @@ "aov_separator": "underscore", "default_render_image_folder": "renders" }, + "CreateUnrealStaticMesh": { + "enabled": true, + "defaults": [ + "", + "_Main" + ], + "static_mesh_prefix": "S_", + "collision_prefixes": [ + "UBX", + "UCP", + "USP", + "UCX" + ] + }, "CreateAnimation": { "enabled": true, "defaults": [ @@ -123,19 +137,6 @@ "Anim" ] }, - "CreateUnrealStaticMesh": { - "enabled": true, - "defaults": [ - "Main" - ], - "static_mesh_prefix": "S_", - "collision_prefixes": [ - "UBX", - "UCP", - "USP", - "UCX" - ] - }, "CreateVrayProxy": { "enabled": true, "defaults": [ diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_templates.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_templates.json index e208069e6f..0548824ee1 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_templates.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_templates.json @@ -143,6 +143,28 @@ "label": "Delivery", "object_type": "text" }, + { + "type": "dict", + "key": "unreal", + "label": "Unreal", + "children": [ + { + "type": "text", + "key": "folder", + "label": "Folder" + }, + { + "type": "text", + "key": "file", + "label": "File" + }, + { + "type": "text", + "key": "path", + "label": "Path" + } + ] + }, { "type": "dict-modifiable", "key": "others", From d51c9da59ca3b491af8845962d9712d9a20c14bc Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 24 Jan 2022 16:59:04 +0100 Subject: [PATCH 087/123] Fix - webpublisher from .psd used wrong value for task Subset name for color coded layer that should be published needs to use task name, not task type. --- .../hosts/photoshop/plugins/publish/collect_remote_instances.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/photoshop/plugins/publish/collect_remote_instances.py b/openpype/hosts/photoshop/plugins/publish/collect_remote_instances.py index e264d04d9f..3994048f7d 100644 --- a/openpype/hosts/photoshop/plugins/publish/collect_remote_instances.py +++ b/openpype/hosts/photoshop/plugins/publish/collect_remote_instances.py @@ -69,7 +69,7 @@ class CollectRemoteInstances(pyblish.api.ContextPlugin): instance.data["family"] = resolved_family instance.data["publish"] = layer.visible instance.data["asset"] = context.data["assetEntity"]["name"] - instance.data["task"] = context.data["taskType"] + instance.data["task"] = context.data["task"] fill_pairs = { "variant": variant, From 105a9a4097753ed0a037869073d53c72374ccedf Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Mon, 24 Jan 2022 17:41:02 +0100 Subject: [PATCH 088/123] update avalon-core --- repos/avalon-core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/avalon-core b/repos/avalon-core index ffe9e910f1..159d2f23e4 160000 --- a/repos/avalon-core +++ b/repos/avalon-core @@ -1 +1 @@ -Subproject commit ffe9e910f1f382e222d457d8e4a8426c41ed43ae +Subproject commit 159d2f23e4c79c04dfac57b68d2ee6ac67adec1b From 506e61f05154c345025ae65d0f62a6cd5cf9adbb Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Mon, 24 Jan 2022 17:48:41 +0100 Subject: [PATCH 089/123] Updated submodule repos/avalon-core --- repos/avalon-core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/avalon-core b/repos/avalon-core index 7e5efd6885..159d2f23e4 160000 --- a/repos/avalon-core +++ b/repos/avalon-core @@ -1 +1 @@ -Subproject commit 7e5efd6885330d84bb8495975bcab84df49bfa3d +Subproject commit 159d2f23e4c79c04dfac57b68d2ee6ac67adec1b From a68f4c46452a9f8018783a0c51688c692dfb3701 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Mon, 24 Jan 2022 17:49:38 +0100 Subject: [PATCH 090/123] Removed submodule openpype/hosts/maya/vendor/studiolibrary --- openpype/hosts/maya/vendor/studiolibrary | 1 - 1 file changed, 1 deletion(-) delete mode 160000 openpype/hosts/maya/vendor/studiolibrary diff --git a/openpype/hosts/maya/vendor/studiolibrary b/openpype/hosts/maya/vendor/studiolibrary deleted file mode 160000 index f29e350da9..0000000000 --- a/openpype/hosts/maya/vendor/studiolibrary +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f29e350da9e9508522a740a4f30efb93b99c89d3 From f6fd68940b999894d122c91ecc116aaef38963cc Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 24 Jan 2022 17:50:14 +0100 Subject: [PATCH 091/123] change label from "I know" to "Later" --- openpype/tools/tray/pype_tray.py | 2 +- .../settings_system_version_downgrade.png | Bin 7777 -> 7012 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py index a21a9de705..cfd0aea2a1 100644 --- a/openpype/tools/tray/pype_tray.py +++ b/openpype/tools/tray/pype_tray.py @@ -180,7 +180,7 @@ class VersionDialog(QtWidgets.QDialog): "Running OpenPype version is {}." " Your production uses version {}." ).format(str(current_version), str(expected_version)) - ignore_label = "I know" + ignore_label = "Later" restart_label = "Restart && Change" self.setWindowTitle(title) diff --git a/website/docs/assets/settings/settings_system_version_downgrade.png b/website/docs/assets/settings/settings_system_version_downgrade.png index 277f2c6bc89a2f565c265e311a233b55d12fba01..b5e35fd1db56cd59e6ee827a63e2be41a6179d41 100644 GIT binary patch literal 7012 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 literal 7777 zcmdUUXIN8Bw{{ej2SFj!AVM%Sk=~^%5CLflN^d42AWfu~Br3h;ks>M}(p3luh7JKV zfb>p)&?NNGJE5KE^PcmbbDbaO=XZTS_MTa@XU(2j)dq1Lnixw>jQ6xD5c5py`huou|@t&vY!j0D#Ls zem`egJU%@J0JwK`wQfJ~w_Qm;PPBz4x6G$t#=*xd*5m6C`&*)fOIa^nVa(DpQ7;QW zo_CEJ$?{bgIMI-NC|X@3S1bJPI`G`J`wYM{_g}H-Nb7>Gxx*l#Nlc*Fi{$pAqUoij z8%rZ<$IsUmaq|=N0doO!xf#JmgZa{XzI%(S{p0h>dtHg|UYZ!HN1V*g5f^uBD*9{K z#dGU#x*=OXdz95G&L({uojXoBcx5c{8yYbX2c#Qg|h$Z^aJVJ0zbX%q)Lr95TWs9O- zAASY1Ob@K6{ld*n+mbvxXX_e*_J<7iwgo2zDR7@wmx0>;uDq84`56Xa?h&oj)k-vb zZBWz=V~^4_U61z!MRIZd>!IMO8)f>WC6u)X(aB-FLCvFjMP@r?Ud*`t@J#$xp0e8H z{n~sQTTPyb(6zAVwls#a?H34IE2A%o&(0>EJl9IquJK&l;aq&8n#bi=eqA8?z?UO;&VE0Y)ISG%Qh z#nOkaQ+CGsg{wulBSpeWm-|tpgEv<~9SpmCTCT-LR#f zdt6X;AH@Y7(|qJFT`tbsnn2vnb*=tHR1Q`>!pU*Zo_v=6I-(L^Wb4J*XfFw3c#~LS z&$!OVi8>QPrOgeSjdGZzKnxc`9Gs6R-Y-zME&%_0aG(2t=Y>%jF0}XT)9}+&OqN{& zFTeQBA^S|dmLuAup5%-O(fW5r3%^RrG5wub5~lwF}@#XwouMj z-1kH1BnG)nKHU=gJ%bCWJYEp_VgxW~`%pd4WmiShOzqhVQxBf}HqruZeoB(yDjrMhA@zCXy6x&=zRquvq zLQiKnn(GX4|K=r+QRt6Uzy6-_Ag6VlD)y+oX0fg&<72&AX`=1HN^!8uZ%O$)ojhLk zTa5Dv=DWneV9qXXt)qT=(2ZCeljfQH^&{f=;b3JfdAm)Cy+opRA3-6~W@Ker#l0AR z@}c>TUtdIpVbA=B4>{;KRXt6s-QKBP1oo&Gfqi^>)8^SW-RN!%3(hAb4kN}MX(6e! zNT2tk*$K1YVsC%Oz{RiMAu${KF$KQ%6WsDO&z*?865L?__51D$QCnf`SqNK^HctS4 z4im?vKi~M|oN=YG~!AMhGJ^{SDfnCn0~g|NDH)VjjV=));$MFmZ%GPW-LmwV1^DnT4}g z%q5=&hLw5LG4V!%806WM50}4TK6O6q$3Im%7aLbrzy~C5ey5{Mr3g8#Q+4A%Pm=ZC zbEnLwcMq4^o$UHlZ@&H^yZ=+c>7a-PJ2Pd1UC%xC-jaB))j>BjDuv?gKq}M^fWzbZMd{=7PF{ zp$l%EA9J`_u~15Txqm(7a_>~UN8e`MWR5^Y{UfOBVKHvrO2kyeRMh=io}v94PoeK6}=st<>PX%8xS0r=ujNjJ`bSaC-w}oLnqw#d0gjX-yIQNW9BT8vPT! z+)XfnUo)WeQxb<*(G*WH5I38Hfm&=CkOQ>*xKzxle0Zzjbk6>EZJu7kFx4h%&_;cS ze#`l6d#blZ%2)ClSAv|I=3AT>zOi68k$f;lRLq5z51F%vj8;Ia&CPSi`+M~p7&ekt zF0L&xDuX3O_woHcBj!iX?D35P8k2&L?GD?dfj1|g7~>3Q0wHiTX5|UP_bbOk==$|U zte+sUngUI3+h2lRGuSsdOq@fsRes)xYjJ?5#~0)>;tHea8GM;XxF*)a6%W5jcFyHQ zjt3k;s~@|9#ZLRgs~0jos~27$V~>zqYc_{Yvozg(>t^x2Q(f6%k%%2f^=&bi4nZri z%+ko#$3o2SOEk{81||L_P|oYdS8M|jCH_3A(&z8{+kWNPu!R@X>`_D7+nJsbTe|L9 z$kx{8^L4;3(OmXG|AdL7e+b>af ztH2N4U#jibUs}v5MO3`42OiVYQ&`LTCBdEhtC%NyZzV8(Nd1r*u~kM0E)X=aEh~ZQ zDjHa4#U<3H%klrbYvGzW=ln9!Z=W#opqVLksbXbAnN(i;T4XwBfAKE9w&_^cWm6b8 z=V@SpA4O9|BMqVlp~jF!#79spHmL5a%p^triuqP!*)CzE0$yQ+Of_Ad)La{f57%V8 zSw%$`DN|IAmn!PBPmjmf774|tFHd?FJr+OJPE2bFWSmVPUvJFy3CV3Ww9R*j8o}2L zsfgvSD06GV!Y1>oE);&M`OX@&*0^I2#|}5&7-f0E&Erk17?#?p1NN_m+0pF0lsB2 zJ}$MQ{Mc$)0l9WvOnLLBjlZ{qSfKlN`ww`W2{QBqeFt0Qzb$ZuGU|ohZn!pjIBFEE zt02D>RS?X^!O;3m=t-C^3zQ1B7DjY$f(N=c$aX@HUTClXyo8$WDJ6u2 z8yI)q^^)w2bnV}o9j;3M2qzW|wu@BW z^y5K)E~gRuCFdG+tYkkZIO=oce8nO+$pMdz86G71!}Xp>JIV0EuIYBP9Wf-I96rR( z{~bB<1Kd(8wVGadKi54ai|J^`9KT!@AMDEqTTN@;a!15}f!pVKW^}OEhSxDkk%UJ5 zm`Zl1;@Ho3@q9VicXw+NGcsdLHF_rF8+r4?p?q)jv@Mutx+*d%2nesqH_(V1%ETl1 zICi6qcAt*_-GLaN@>9am7w2+IZTbX?!_vz!t3E-3jL$^#W$Y0vL7?ZGxSOi3lQl^NfQ<(siKI)KZZ z5)~UoI}u}i3f==Ld>tcQG9yQ`s;m8YMgF^b30et4m*p9j%hUcQ&hC6+LURG}g z6e^M9$KG!3fu8!~)q^c^kWsJCli|MSao~qUH^)K?zahf*@-)Lxb0jCm7e z8Wu1ZM;s_t)x_1_)Xo&$-_F@GJU;M(wI|eB4y33>pQz+vaQXcp*{1fE>}!NB_HRf0 zZ!YxS8_^LohrP@)AeR1Kf4ua%y9^tlclf(cr$(-ifbZo;wsLU&IrHZ0Jc$J&FxCV4 z^_!t)MB;PYArg=|%pw!1t~IT|5T%#liFiiriQ^6xSZB zy4EL`xmrrty=nf&hP)h@K)-L!F)*;>lG0q@I|i-NSO+$z*yi(-iv~-`tj*U;aGJ`% zmaGoz2;Zl!$!akmY}Ob@uZ03WNMc-O%(3+Hb1*hmmDD0e`HILZiJe5i1ri zomT(2f8+I5UvT7e2a~qW2L?+~>H@;a2w|TXsftL11G3BPDp*_P&SJ%=Hg=;7Ga^j&#=Yo`>s}jb(f)VT5Zt*o!Vkm8#+NP*e6)1Vs&9n0Nc zM@p#Y6PEgbR+)~w_LBpV3FqOj?}XUgqrHTX;o75 zy>dGEMUo$(^RPZ$CTX<_Yln$rE*O2T9{%_k>zTiy(?T$;h1743bwFe!U?;Y~!kJr@ zMoDt6IoF?IXt;K|BXZ4IbH{iYfdp=;+0pRppZL$a^}i3Q_!&rPeuLD=@Kxz;)|)Hr z`1}g(slv!H4^*6N3*V;A;pMKt6XKeezLLd`WHH*TsJwME8*-()O8F8lhS4>2OlC3g zX^FvZVRozy$gH>CSl!ajLLn}IG#ZZJn`5I~^rYVck|6{*K`hl81y#>Pm2lKDa&|iz zU_5fuow&OBIQ_18Y33F;-*h6|Oh_CH!u5u79acY2EfF%Vi4%6M-_{GITd^|sfAES> zF>_W#!R}FX=5kjw{fd=v6o283uO|s_yUzBD!vgxd?zlrGg1w`vN0u&w7F-g9Iw2)x zOi`bW*%py!9i7AhK$q{xmi`sNbT^>av036@m#1{2HV0(5AuQ?w-6wwJewwZxYXC%0 zm*>a3)h5SXtwMh}UOOo36yQVB^&sm>@c8{`bM-Z;w9G2N|CKRxypJ3_p2tu0P*`4$ zofe)D}P8J&^bdl4z@aNOt}Wv;VL=W}XN zo{jdV?G;{hkIU1>FSoQL9_(u2qs@Q8i2!U2TS<(>F%$K0!c;_`gQ+AR5|^6M*HfSA~33cE1u4OCbCU(4n9+_3r_P7;JBClI< z1Y4NIW=rwcV=|5BNX7%Y%s$*j1{DzYw!7+&M3zS-cZ)m2cbJY_L2nPL>TR!5 zSV=Lkhvi1_^rAC++;gHCH{maL;lR+U<-0Hdz^OTUxVh8HdFOrmz(t$JsE>lcYRwG6 z6n={w-H+>onUMlGO^8V%oF4d%#6-H`iFl)XgI!QpsUjK${PwAc+X_LP{t!WACzZH4 zbR=v%gc+-!B=9otv{tc(GmqypF`*>*PpYLtH*Yj*gX{v+6QbX~imU3IXqi}zvE45b)*Vqw3C0onY&}zm820quco)>O8`% z@*^U;cbqxs{^tK|6>r3uveHc$Y<{v<7GENW>s5s^6nL`u_tFmx$qe6Q^+_JK=)>DZ zvmVBuYe#>pG>cWjYmpsiI~g?|gDs@5l1{Q-Na@?A?{3u_mdSI#Ui7Ov3I&e%LI?1nh|#r2MkI0fTvj zm95^xKUP*m-&5}?MFDQ{$xs?E2lXJNKMDSneV0#L1+8Lx{daASjuWD378reRSSyiV zEMg0eAY6=%-)Sw0#AiRU*5^VDG*vDb4aBYbT!V=NU3@f+#apf}J@vxEImqvA^B)`< z9L7L9R)AjV_?r7#p&%#$qou$9Tz$TeAcie4R`&qhief9t6%o(Ne3ush)K-J<}R| zoB@6`uEb4*1uorP4((`B!vCPxeeIpd??LFbR#sPglj+XHCY)1leU#Z)Z4T0yoCWnG zm?(P1CK}cnLBM>;448zVT0(&7ko17wUTKvX7ZHo5hNrP(>9EDYJWh8{M_|gc#e~DJ@{c*_Bv;?I1E%APzyFz;*bi7O_`)k zk1{V+Lw3^`&;Y>Iu*eM#%kuyV?bg7Rs4R$OT@GXc@WPe`NFxLs z%-7H>h6)Buy9HjM1$fhHF{EiZ6>H@GdYH~svLvDjxFzv2@(cj*lRXjy0K9Ph|BVoV z(GOwr{f;_m2Yz1yG*~x94+j;28xw!8X89|me7mcgr2Bif=W7mB-lGA3|F19pB*%qq zuZbd4Dj#6(hADpE5$2!%7XZMkP#F1(ZWhfS9_hGdZoZ?#Y;siKiBxs|WKRio5irQH=-NMU0GnS?I#NCa?{SbO<4i zfF|6xniQlCv@InH;1I7fXN$6)+EAe56v9Ed#7z_Ve$v~v7=}^zwYR`OjHKU7&Rpo$ zOa=d#Y;>Um&d?R-mv{M4cdiTY=RslSEgD<0d7bD+5&X&Yck&X!lIAyCHl0S1(-s`7 z_1ESdt9hkA|9TIaiI!KtqxXu}1M5@tPq(Psf4cGik8ao}p{we+kf8#HZxMeOKDPM; z8TRb|AbfK0y5yElei3=5r^N~Ob%Da|y}VC{7BoG+21~=X2T0R8dp{^9su6k?GP%9e zEr-<1RD%C5pDajGtOQH#s`B0CjsuSJbdEe*;Hmze^m{Kpk{R`K_Dhgct?4Il&^qZ$qoCcAf7*^Wi`*FK1?9p|p)e%K<+S{8n>FdxzZN^|o1+OGno>Vp~@yrvejoxu89EUJp6D|hs3hiGn?f; zB7Y|poGoxW4+4|dO=;~HoPpfe13t4Wn1-DfF=!z4utiC-A76Nx_^M~7zTr@Dh8g8$ z6S9(Tv5*FcDiPW+S9v-I#O)Rf#31V$l1V*nCX+j}rajESBqy>p)uCUg-J!}v8S;e8 zZ)8y}TIJaElm7LQrErRor6`h=svZ06JSy7b3*Yl^RX1T6$n^7#KQ_R zcrE3!2*&tV`%q>lkFdA*lFWLzi zTGB0aLe(v*JAYG)eCI0CGuPsz`*&1gxn9n!&z6Z!C~IW&b=^i!?_+*bK2Xc<@~7>G z30=i^vm=Eepux4BM05IoTm8#i17Hj)kFD*BR>vE{v3|$+w_@OdJsnH{l z7@c%7{@syvc>9i-&!(fbzDcQ3Q%{toGQ>1>z%5m)aCtaxQcDLCoUY_qcu`kLLdsA* zJPSz=)Pq~S)3ls8``@GmjbO=wvPcWVE{OOGKCm5Vq@ QY7;;gYN%DDVgKqs0NafSyZ`_I From cfd33342aefdeb4f8bb8a628cadaffee7e66bea4 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 24 Jan 2022 18:01:06 +0100 Subject: [PATCH 092/123] Change label "Later" to "Ignore" --- openpype/tools/tray/pype_tray.py | 2 +- .../settings_system_version_downgrade.png | Bin 7012 -> 6937 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py index cfd0aea2a1..99d431172a 100644 --- a/openpype/tools/tray/pype_tray.py +++ b/openpype/tools/tray/pype_tray.py @@ -180,7 +180,7 @@ class VersionDialog(QtWidgets.QDialog): "Running OpenPype version is {}." " Your production uses version {}." ).format(str(current_version), str(expected_version)) - ignore_label = "Later" + ignore_label = "Ignore" restart_label = "Restart && Change" self.setWindowTitle(title) diff --git a/website/docs/assets/settings/settings_system_version_downgrade.png b/website/docs/assets/settings/settings_system_version_downgrade.png index b5e35fd1db56cd59e6ee827a63e2be41a6179d41..e3a5d7f499320eccda56909050b3666f6691f385 100644 GIT binary patch literal 6937 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 From a7b74602594f22957c7cc3da2dd50e163e60b8bb Mon Sep 17 00:00:00 2001 From: OpenPype Date: Mon, 24 Jan 2022 20:03:08 +0000 Subject: [PATCH 093/123] [Automated] Bump version --- CHANGELOG.md | 25 ++++++++++--------------- openpype/version.py | 2 +- pyproject.toml | 2 +- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bffbc69931..4a479364fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,18 @@ # Changelog -## [3.8.0-nightly.6](https://github.com/pypeclub/OpenPype/tree/HEAD) +## [3.8.0-nightly.7](https://github.com/pypeclub/OpenPype/tree/HEAD) [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.7.0...HEAD) ### 📖 Documentation -- Renamed to proper name [\#2546](https://github.com/pypeclub/OpenPype/pull/2546) -- Slack: Add review to notification message [\#2498](https://github.com/pypeclub/OpenPype/pull/2498) +- Variable in docs renamed to proper name [\#2546](https://github.com/pypeclub/OpenPype/pull/2546) **🆕 New features** +- Flame: extracting segments with trans-coding [\#2547](https://github.com/pypeclub/OpenPype/pull/2547) +- Maya : V-Ray Proxy - load all ABC files via proxy [\#2544](https://github.com/pypeclub/OpenPype/pull/2544) +- Maya to Unreal: Extended static mesh workflow [\#2537](https://github.com/pypeclub/OpenPype/pull/2537) - Flame: collecting publishable instances [\#2519](https://github.com/pypeclub/OpenPype/pull/2519) - Flame: create publishable clips [\#2495](https://github.com/pypeclub/OpenPype/pull/2495) @@ -21,23 +23,20 @@ - Webpublisher: Added endpoint to reprocess batch through UI [\#2555](https://github.com/pypeclub/OpenPype/pull/2555) - Settings: PathInput strip passed string [\#2550](https://github.com/pypeclub/OpenPype/pull/2550) - Global: Exctract Review anatomy fill data with output name [\#2548](https://github.com/pypeclub/OpenPype/pull/2548) -- Flame: extracting segments with trans-coding [\#2547](https://github.com/pypeclub/OpenPype/pull/2547) - Cosmetics: Clean up some cosmetics / typos [\#2542](https://github.com/pypeclub/OpenPype/pull/2542) - General: Validate if current process OpenPype version is requested version [\#2529](https://github.com/pypeclub/OpenPype/pull/2529) - General: Be able to use anatomy data in ffmpeg output arguments [\#2525](https://github.com/pypeclub/OpenPype/pull/2525) - Expose toggle publish plug-in settings for Maya Look Shading Engine Naming [\#2521](https://github.com/pypeclub/OpenPype/pull/2521) - Photoshop: Move implementation to OpenPype [\#2510](https://github.com/pypeclub/OpenPype/pull/2510) -- TimersManager: Move module one hierarchy higher [\#2501](https://github.com/pypeclub/OpenPype/pull/2501) - Slack: notifications are sent with Openpype logo and bot name [\#2499](https://github.com/pypeclub/OpenPype/pull/2499) -- Project Manager: Remove project button cleanup [\#2482](https://github.com/pypeclub/OpenPype/pull/2482) -- Maya: Refactor missing \_get\_reference\_node method [\#2455](https://github.com/pypeclub/OpenPype/pull/2455) -- Houdini: Remove broken unique name counter [\#2450](https://github.com/pypeclub/OpenPype/pull/2450) -- Maya: Improve lib.polyConstraint performance when Select tool is not the active tool context [\#2447](https://github.com/pypeclub/OpenPype/pull/2447) +- Slack: Add review to notification message [\#2498](https://github.com/pypeclub/OpenPype/pull/2498) +- Maya: Collect 'fps' animation data only for "review" instances [\#2486](https://github.com/pypeclub/OpenPype/pull/2486) - General: Validate third party before build [\#2425](https://github.com/pypeclub/OpenPype/pull/2425) **🐛 Bug fixes** - AfterEffects: Fix - removed obsolete import [\#2577](https://github.com/pypeclub/OpenPype/pull/2577) +- General: OpenPype version updates [\#2575](https://github.com/pypeclub/OpenPype/pull/2575) - Ftrack: Delete action revision [\#2563](https://github.com/pypeclub/OpenPype/pull/2563) - Webpublisher: ftrack shows incorrect user names [\#2560](https://github.com/pypeclub/OpenPype/pull/2560) - General: Do not validate version if build does not support it [\#2557](https://github.com/pypeclub/OpenPype/pull/2557) @@ -46,6 +45,8 @@ - General: Fix install thread in igniter [\#2549](https://github.com/pypeclub/OpenPype/pull/2549) - Houdini: vdbcache family preserve frame numbers on publish integration + enable validate version for Houdini [\#2535](https://github.com/pypeclub/OpenPype/pull/2535) - Maya: Fix Load VDB to V-Ray [\#2533](https://github.com/pypeclub/OpenPype/pull/2533) +- Maya: ReferenceLoader fix not unique group name error for attach to root [\#2532](https://github.com/pypeclub/OpenPype/pull/2532) +- Maya: namespaced context go back to original namespace when started from inside a namespace [\#2531](https://github.com/pypeclub/OpenPype/pull/2531) - Fix create zip tool - path argument [\#2522](https://github.com/pypeclub/OpenPype/pull/2522) - Maya: Fix Extract Look with space in names [\#2518](https://github.com/pypeclub/OpenPype/pull/2518) - Fix published frame content for sequence starting with 0 [\#2513](https://github.com/pypeclub/OpenPype/pull/2513) @@ -59,8 +60,6 @@ - Maya: Remove Maya Look Assigner check on startup [\#2540](https://github.com/pypeclub/OpenPype/pull/2540) - build\(deps\): bump shelljs from 0.8.4 to 0.8.5 in /website [\#2538](https://github.com/pypeclub/OpenPype/pull/2538) - build\(deps\): bump follow-redirects from 1.14.4 to 1.14.7 in /website [\#2534](https://github.com/pypeclub/OpenPype/pull/2534) -- Maya: ReferenceLoader fix not unique group name error for attach to root [\#2532](https://github.com/pypeclub/OpenPype/pull/2532) -- Maya: namespaced context go back to original namespace when started from inside a namespace [\#2531](https://github.com/pypeclub/OpenPype/pull/2531) - Nuke: Merge avalon's implementation into OpenPype [\#2514](https://github.com/pypeclub/OpenPype/pull/2514) ## [3.7.0](https://github.com/pypeclub/OpenPype/tree/3.7.0) (2022-01-04) @@ -76,16 +75,12 @@ - Settings UI: Hyperlinks to settings [\#2420](https://github.com/pypeclub/OpenPype/pull/2420) - Modules: JobQueue module moved one hierarchy level higher [\#2419](https://github.com/pypeclub/OpenPype/pull/2419) - TimersManager: Start timer post launch hook [\#2418](https://github.com/pypeclub/OpenPype/pull/2418) -- General: Run applications as separate processes under linux [\#2408](https://github.com/pypeclub/OpenPype/pull/2408) **🐛 Bug fixes** - TVPaint: Create render layer dialog is in front [\#2471](https://github.com/pypeclub/OpenPype/pull/2471) - Short Pyblish plugin path [\#2428](https://github.com/pypeclub/OpenPype/pull/2428) - PS: Introduced settings for invalid characters to use in ValidateNaming plugin [\#2417](https://github.com/pypeclub/OpenPype/pull/2417) -- Settings UI: Breadcrumbs path does not create new entities [\#2416](https://github.com/pypeclub/OpenPype/pull/2416) -- AfterEffects: Variant 2022 is in defaults but missing in schemas [\#2412](https://github.com/pypeclub/OpenPype/pull/2412) -- Nuke: baking representations was not additive [\#2406](https://github.com/pypeclub/OpenPype/pull/2406) **Merged pull requests:** diff --git a/openpype/version.py b/openpype/version.py index 60e619d7c0..7bf7cf1108 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.8.0-nightly.6" +__version__ = "3.8.0-nightly.7" diff --git a/pyproject.toml b/pyproject.toml index 72152bd433..0f2f2a05b8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "OpenPype" -version = "3.8.0-nightly.6" # OpenPype +version = "3.8.0-nightly.7" # OpenPype description = "Open VFX and Animation pipeline with support." authors = ["OpenPype Team "] license = "MIT License" From 0c437017d44888afb1ff8c90f5b88d0fb2b10e08 Mon Sep 17 00:00:00 2001 From: OpenPype Date: Mon, 24 Jan 2022 20:19:26 +0000 Subject: [PATCH 094/123] [Automated] Release --- CHANGELOG.md | 13 ++++++------- openpype/version.py | 2 +- pyproject.toml | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a479364fc..7516ac4c7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,8 @@ # Changelog -## [3.8.0-nightly.7](https://github.com/pypeclub/OpenPype/tree/HEAD) +## [3.8.0](https://github.com/pypeclub/OpenPype/tree/3.8.0) (2022-01-24) -[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.7.0...HEAD) - -### 📖 Documentation - -- Variable in docs renamed to proper name [\#2546](https://github.com/pypeclub/OpenPype/pull/2546) +[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.7.0...3.8.0) **🆕 New features** @@ -54,6 +50,10 @@ - Improve FusionPreLaunch hook errors [\#2505](https://github.com/pypeclub/OpenPype/pull/2505) - Maya: Validate Shape Zero do not keep fixed geometry vertices selected/active after repair [\#2456](https://github.com/pypeclub/OpenPype/pull/2456) +### 📖 Documentation + +- Variable in docs renamed to proper name [\#2546](https://github.com/pypeclub/OpenPype/pull/2546) + **Merged pull requests:** - AfterEffects: Move implementation to OpenPype [\#2543](https://github.com/pypeclub/OpenPype/pull/2543) @@ -78,7 +78,6 @@ **🐛 Bug fixes** -- TVPaint: Create render layer dialog is in front [\#2471](https://github.com/pypeclub/OpenPype/pull/2471) - Short Pyblish plugin path [\#2428](https://github.com/pypeclub/OpenPype/pull/2428) - PS: Introduced settings for invalid characters to use in ValidateNaming plugin [\#2417](https://github.com/pypeclub/OpenPype/pull/2417) diff --git a/openpype/version.py b/openpype/version.py index 7bf7cf1108..d6569ec1c0 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.8.0-nightly.7" +__version__ = "3.8.0" diff --git a/pyproject.toml b/pyproject.toml index 0f2f2a05b8..feef6071a6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "OpenPype" -version = "3.8.0-nightly.7" # OpenPype +version = "3.8.0" # OpenPype description = "Open VFX and Animation pipeline with support." authors = ["OpenPype Team "] license = "MIT License" From 122e28660812519948db0707b32f03a24bd22aa7 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 25 Jan 2022 12:13:38 +0100 Subject: [PATCH 095/123] fixing otio frame offset --- openpype/plugins/publish/extract_otio_review.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_otio_review.py b/openpype/plugins/publish/extract_otio_review.py index 675e5e0ee0..7cde5ab97e 100644 --- a/openpype/plugins/publish/extract_otio_review.py +++ b/openpype/plugins/publish/extract_otio_review.py @@ -273,6 +273,8 @@ class ExtractOTIOReview(openpype.api.Extractor): src_start = int(avl_start + start) avl_durtation = int(avl_range.duration.value) + self.need_offset = bool(avl_start != 0 and src_start != 0) + # if media start is les then clip requires if src_start < avl_start: # calculate gap @@ -408,11 +410,17 @@ class ExtractOTIOReview(openpype.api.Extractor): """ padding = "{{:0{}d}}".format(self.padding) + + # create frame offset + offset = 0 + if self.need_offset: + offset = 1 + if end_offset: new_frames = list() start_frame = self.used_frames[-1] - for index in range((end_offset + 1), - (int(end_offset + duration) + 1)): + for index in range((end_offset + offset), + (int(end_offset + duration) + offset)): seq_number = padding.format(start_frame + index) self.log.debug( "index: `{}` | seq_number: `{}`".format(index, seq_number)) From 323a8274f0c7686ee2562ce6b4688b81232d1ac7 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Tue, 25 Jan 2022 14:47:28 +0100 Subject: [PATCH 096/123] mark openpype repository as secondary --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index feef6071a6..ef3747e5d8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -97,6 +97,7 @@ toml = "^0.10.2" # for parsing pyproject.toml [[tool.poetry.source]] name = "openpype" url = "https://distribute.openpype.io/wheels/" +secondary = true [build-system] requires = ["poetry-core>=1.0.0"] From 4958672bf120e1683514113e1e4d1d9a52a81fc2 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Tue, 25 Jan 2022 14:53:46 +0100 Subject: [PATCH 097/123] updated speedcopy --- poetry.lock | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/poetry.lock b/poetry.lock index f513b76611..c870834e21 100644 --- a/poetry.lock +++ b/poetry.lock @@ -302,11 +302,6 @@ python-versions = ">=3.6" cx-logging = {version = ">=3.0", markers = "sys_platform == \"win32\""} importlib-metadata = ">=4.3.1" -[package.source] -type = "legacy" -url = "https://distribute.openpype.io/wheels" -reference = "openpype" - [[package]] name = "cx-logging" version = "3.0" @@ -1286,8 +1281,8 @@ python-versions = "*" [[package]] name = "speedcopy" -version = "2.1.0" -description = "Replacement or alternative for python copyfile()utilizing server side copy on network shares for fastercopying." +version = "2.1.2" +description = "Replacement or alternative for python copyfile() utilizing server side copy on network shares for faster copying." category = "main" optional = false python-versions = "*" @@ -1580,7 +1575,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes [metadata] lock-version = "1.1" python-versions = "3.7.*" -content-hash = "877c1c6292735f495d915fc6aa85450eb20fc63f266a9c6bf7ba1125af3579a5" +content-hash = "8bbbb69661d3eefbabf4a18398804bce436a910e61355de66ebefb5c2c23307c" [metadata.files] acre = [] @@ -1821,7 +1816,17 @@ cryptography = [ {file = "cryptography-35.0.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:1ed82abf16df40a60942a8c211251ae72858b25b7421ce2497c2eb7a1cee817c"}, {file = "cryptography-35.0.0.tar.gz", hash = "sha256:9933f28f70d0517686bd7de36166dda42094eac49415459d9bdf5e7df3e0086d"}, ] -cx-freeze = [] +cx-freeze = [ + {file = "cx_Freeze-6.7-cp36-cp36m-win32.whl", hash = "sha256:befd5a2fb915eae03bfb237ffebeb7a5dfe8f58bc8c93c18f19a47c1fc800d8a"}, + {file = "cx_Freeze-6.7-cp36-cp36m-win_amd64.whl", hash = "sha256:7718801da4a3ad499b0d648c507759f3b7ffef24ba4e9fd8ff3b129b77dda0e3"}, + {file = "cx_Freeze-6.7-cp37-cp37m-win32.whl", hash = "sha256:361f27b1575b508a52fe3eb0afe83f2594c44235d084e04815924ea48742f0ea"}, + {file = "cx_Freeze-6.7-cp37-cp37m-win_amd64.whl", hash = "sha256:65aec3b37b91b0a41ccf61b9794d8660b809d665a529479489ab410a201736fc"}, + {file = "cx_Freeze-6.7-cp38-cp38-win32.whl", hash = "sha256:ec3bb21bc74c4fea458563f6e47191daa5486f089aebb1d00a922b5aa9834c87"}, + {file = "cx_Freeze-6.7-cp38-cp38-win_amd64.whl", hash = "sha256:1b76c72f8a2c0e1a416b7bced9d5fd247a0120f6b1b35d4678568beb1ccf9380"}, + {file = "cx_Freeze-6.7-cp39-cp39-win32.whl", hash = "sha256:beb38b2df37af44d08a1e62f09f0e1c5b991ded751f7cc3ab0ac93fba013ba54"}, + {file = "cx_Freeze-6.7-cp39-cp39-win_amd64.whl", hash = "sha256:967c86416b8dea3b00c0f1e2c94f5118004c9297afc8b1ae88002aec28a9097c"}, + {file = "cx_Freeze-6.7.tar.gz", hash = "sha256:050f1dd133a04810bd7f38ac7ae3b290054acb2ff4f6e73f7a286266d153495d"}, +] cx-logging = [ {file = "cx_Logging-3.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:9fcd297e5c51470521c47eff0f86ba844aeca6be97e13c3e2114ebdf03fa3c96"}, {file = "cx_Logging-3.0-cp36-cp36m-win32.whl", hash = "sha256:0df4be47c5022cc54316949e283403214568ef599817ced0c0972183d6d4fabb"}, @@ -2538,8 +2543,8 @@ snowballstemmer = [ {file = "snowballstemmer-2.1.0.tar.gz", hash = "sha256:e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"}, ] speedcopy = [ - {file = "speedcopy-2.1.0-py3-none-any.whl", hash = "sha256:b80926ff900c0d7c8a0cb5f0a407258dde83976d923e3a449ac5417aa6608f63"}, - {file = "speedcopy-2.1.0.tar.gz", hash = "sha256:8bb1a6c735900b83901a7be84ba2175ed3887c13c6786f97dea48f2ea7d504c2"}, + {file = "speedcopy-2.1.2-py3-none-any.whl", hash = "sha256:91e271b84c00952812dbf669d360b2610fd8fa198670373e02acf2a04db89a4c"}, + {file = "speedcopy-2.1.2.tar.gz", hash = "sha256:1b2d779fadebd53a59384f7d286c40b2ef382e0d000fa53011699fcd3190d33f"}, ] sphinx = [ {file = "Sphinx-3.5.3-py3-none-any.whl", hash = "sha256:3f01732296465648da43dec8fb40dc451ba79eb3e2cc5c6d79005fd98197107d"}, From d6be6b0182f84fe746ae00d09e697db937ab6796 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 25 Jan 2022 15:14:21 +0100 Subject: [PATCH 098/123] Added CollectSceneVersion to Settings --- .../defaults/project_settings/global.json | 18 ++++++++++++++++ .../schemas/schema_global_publish.json | 21 +++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index cff1259c98..3b5bb06267 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -3,6 +3,24 @@ "CollectAnatomyInstanceData": { "follow_workfile_version": false }, + "CollectSceneVersion": { + "hosts": [ + "aftereffects", + "blender", + "celaction", + "fusion", + "harmony", + "hiero", + "houdini", + "maya", + "nuke", + "photoshop", + "resolve", + "tvpaint" + ], + "skip_hosts_headless_publish": [ + ] + }, "ValidateEditorialAssetName": { "enabled": true, "optional": false diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index d146f3cf15..3f9776bcd6 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -18,6 +18,27 @@ } ] }, + { + "type": "dict", + "collapsible": true, + "key": "CollectSceneVersion", + "label": "Collect Version from Workfile", + "is_group": true, + "children": [ + { + "key": "hosts", + "label": "Host names", + "type": "hosts-enum", + "multiselection": true + }, + { + "key": "skip_hosts_headless_publish", + "label": "Skip for host if headless publish", + "type": "hosts-enum", + "multiselection": true + } + ] + }, { "type": "dict", "collapsible": true, From 676dce041abe1335bdbe2fdd94147c949e2f426a Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 25 Jan 2022 15:15:57 +0100 Subject: [PATCH 099/123] Added possibility to skip version collecting Useful for headless publishing via webpublisher. Currently applicable only for Photoshop studio processing. --- openpype/plugins/publish/collect_scene_version.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/openpype/plugins/publish/collect_scene_version.py b/openpype/plugins/publish/collect_scene_version.py index 8ed6e25e66..56a6e3fb46 100644 --- a/openpype/plugins/publish/collect_scene_version.py +++ b/openpype/plugins/publish/collect_scene_version.py @@ -11,6 +11,7 @@ class CollectSceneVersion(pyblish.api.ContextPlugin): order = pyblish.api.CollectorOrder label = 'Collect Scene Version' + # configurable in Settings hosts = [ "aftereffects", "blender", @@ -26,7 +27,20 @@ class CollectSceneVersion(pyblish.api.ContextPlugin): "tvpaint" ] + # in some cases of headless publishing (for example webpublisher using PS) + # you want to ignore version from name and let integrate use next version + skip_hosts_headless_publish = [ + + ] + def process(self, context): + # tests should be close to regular publish as possible + if (context.data["hostName"] in self.skip_hosts_headless_publish + and os.environ.get("HEADLESS_PUBLISH") + and not os.environ.get("IS_TEST")): + self.log.debug("Skipping for headless publishing") + return + assert context.data.get('currentFile'), "Cannot get current file" filename = os.path.basename(context.data.get('currentFile')) From 4c695d9ebc2ad26fde6257be7931f517cfb7d818 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 25 Jan 2022 15:24:52 +0100 Subject: [PATCH 100/123] Added mentioning HEADLESS_PUBLISH in readme for integration tests --- tests/integration/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/integration/README.md b/tests/integration/README.md index 0b6a1804ae..eef8141127 100644 --- a/tests/integration/README.md +++ b/tests/integration/README.md @@ -5,6 +5,9 @@ Contains end-to-end tests for automatic testing of OP. Should run headless publish on all hosts to check basic publish use cases automatically to limit regression issues. +Uses env var `HEADLESS_PUBLISH` (set in test data zip files) to differentiate between regular publish +and "automated" one. + How to run ---------- - activate `{OPENPYPE_ROOT}/.venv` From c71e071a55cc04a065f5f6060eef6e676ff650cc Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 25 Jan 2022 15:33:55 +0100 Subject: [PATCH 101/123] Update openpype/tools/launcher/widgets.py Co-authored-by: Milan Kolar --- openpype/tools/launcher/widgets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/tools/launcher/widgets.py b/openpype/tools/launcher/widgets.py index ae95e2e8d8..beff2548f2 100644 --- a/openpype/tools/launcher/widgets.py +++ b/openpype/tools/launcher/widgets.py @@ -202,7 +202,7 @@ class ActionBar(QtWidgets.QWidget): return menu = QtWidgets.QMenu(self.view) - checkbox = QtWidgets.QCheckBox("Force not open last workfile", + checkbox = QtWidgets.QCheckBox("Skip opening last workfile.", menu) if index.data(FORCE_NOT_OPEN_WORKFILE_ROLE): checkbox.setChecked(True) From cd331519a82e89c312f686f1c9a1aec2d6b1c127 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Tue, 25 Jan 2022 15:54:12 +0100 Subject: [PATCH 102/123] Updated comment in Pillow --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7e38bf5c50..9e1ffb0d8a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ jsonschema = "^3.2.0" keyring = "^22.0.1" log4mongo = "^1.7" pathlib2= "^2.3.5" # deadline submit publish job only (single place, maybe not needed?) -Pillow = "^9.0" # only used for slates prototype +Pillow = "^9.0" # used in TVPaint and for slates pyblish-base = "^1.8.8" pynput = "^1.7.2" # idle manager in tray pymongo = "^3.11.2" From d07dc4ac999084b640cc2ec4834f2c17655cbccb Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 25 Jan 2022 17:22:24 +0100 Subject: [PATCH 103/123] OP-1117 - fixed typos --- openpype/hooks/pre_add_last_workfile_arg.py | 2 +- openpype/lib/applications.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/hooks/pre_add_last_workfile_arg.py b/openpype/hooks/pre_add_last_workfile_arg.py index 4ff5e17edc..048545a150 100644 --- a/openpype/hooks/pre_add_last_workfile_arg.py +++ b/openpype/hooks/pre_add_last_workfile_arg.py @@ -7,7 +7,7 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook): This is not possible to do for all applications the same way. Checks 'start_last_workfile', if set to False, it will not open last - wokfile. This property is set explicitly in Launcher. + workfile. This property is set explicitly in Launcher. """ # Execute after workfile template copy diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py index 152dc6af6b..1278ed396e 100644 --- a/openpype/lib/applications.py +++ b/openpype/lib/applications.py @@ -1511,7 +1511,7 @@ def _prepare_last_workfile(data, workdir): project_name, app.host_name, task_name, task_type ) else: - log.info("Explicitly forbidden to open last workfile") + log.info("Opening of last workfile was disabled by user") data["start_last_workfile"] = start_last_workfile From 782a430cae00a70c097164e5eff2e5cb70c6fa1b Mon Sep 17 00:00:00 2001 From: OpenPype Date: Wed, 26 Jan 2022 03:37:33 +0000 Subject: [PATCH 104/123] [Automated] Bump version --- CHANGELOG.md | 34 +++++++++++++++++++++++----------- openpype/version.py | 2 +- pyproject.toml | 2 +- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7516ac4c7b..b7741122f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,30 @@ # Changelog +## [3.8.1-nightly.1](https://github.com/pypeclub/OpenPype/tree/HEAD) + +[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.8.0...HEAD) + +**🚀 Enhancements** + +- Loader: Allow to toggle default family filters between "include" or "exclude" filtering [\#2541](https://github.com/pypeclub/OpenPype/pull/2541) + +**🐛 Bug fixes** + +- Webpublisher: Fix - subset names from processed .psd used wrong value for task [\#2586](https://github.com/pypeclub/OpenPype/pull/2586) +- `vrscene` creator Deadline webservice URL handling [\#2580](https://github.com/pypeclub/OpenPype/pull/2580) +- global: track name was failing if duplicated root word in name [\#2568](https://github.com/pypeclub/OpenPype/pull/2568) + +**Merged pull requests:** + +- build\(deps\): bump pillow from 8.4.0 to 9.0.0 [\#2523](https://github.com/pypeclub/OpenPype/pull/2523) + ## [3.8.0](https://github.com/pypeclub/OpenPype/tree/3.8.0) (2022-01-24) -[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.7.0...3.8.0) +[Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.8.0-nightly.7...3.8.0) + +### 📖 Documentation + +- Variable in docs renamed to proper name [\#2546](https://github.com/pypeclub/OpenPype/pull/2546) **🆕 New features** @@ -50,10 +72,6 @@ - Improve FusionPreLaunch hook errors [\#2505](https://github.com/pypeclub/OpenPype/pull/2505) - Maya: Validate Shape Zero do not keep fixed geometry vertices selected/active after repair [\#2456](https://github.com/pypeclub/OpenPype/pull/2456) -### 📖 Documentation - -- Variable in docs renamed to proper name [\#2546](https://github.com/pypeclub/OpenPype/pull/2546) - **Merged pull requests:** - AfterEffects: Move implementation to OpenPype [\#2543](https://github.com/pypeclub/OpenPype/pull/2543) @@ -70,16 +88,10 @@ - General: Workdir extra folders [\#2462](https://github.com/pypeclub/OpenPype/pull/2462) - Photoshop: New style validations for New publisher [\#2429](https://github.com/pypeclub/OpenPype/pull/2429) -- General: Environment variables groups [\#2424](https://github.com/pypeclub/OpenPype/pull/2424) -- Unreal: Dynamic menu created in Python [\#2422](https://github.com/pypeclub/OpenPype/pull/2422) -- Settings UI: Hyperlinks to settings [\#2420](https://github.com/pypeclub/OpenPype/pull/2420) -- Modules: JobQueue module moved one hierarchy level higher [\#2419](https://github.com/pypeclub/OpenPype/pull/2419) -- TimersManager: Start timer post launch hook [\#2418](https://github.com/pypeclub/OpenPype/pull/2418) **🐛 Bug fixes** - Short Pyblish plugin path [\#2428](https://github.com/pypeclub/OpenPype/pull/2428) -- PS: Introduced settings for invalid characters to use in ValidateNaming plugin [\#2417](https://github.com/pypeclub/OpenPype/pull/2417) **Merged pull requests:** diff --git a/openpype/version.py b/openpype/version.py index d6569ec1c0..60daa4f54f 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.8.0" +__version__ = "3.8.1-nightly.1" diff --git a/pyproject.toml b/pyproject.toml index 9e1ffb0d8a..7403cbaf8a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "OpenPype" -version = "3.8.0" # OpenPype +version = "3.8.1-nightly.1" # OpenPype description = "Open VFX and Animation pipeline with support." authors = ["OpenPype Team "] license = "MIT License" From 2bb63fa2c712e4fdf6ba71a4a84feac6f3d9dafc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= Date: Wed, 26 Jan 2022 16:04:04 +0100 Subject: [PATCH 105/123] switch distutils for sysconfig --- tools/build_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build_dependencies.py b/tools/build_dependencies.py index 8eaf9d87e3..d3566dd289 100644 --- a/tools/build_dependencies.py +++ b/tools/build_dependencies.py @@ -21,7 +21,7 @@ speed. import os import sys import site -from distutils.util import get_platform +from sysconfig import get_platform import platform import subprocess from pathlib import Path From a097302a45c4d2acdf7866e5a918b85b7d2d4e83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 16:38:23 +0000 Subject: [PATCH 106/123] Bump pillow from 8.4.0 to 9.0.0 Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.4.0 to 9.0.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/8.4.0...9.0.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- poetry.lock | 123 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 44 deletions(-) diff --git a/poetry.lock b/poetry.lock index c870834e21..4d5ba5407b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -784,11 +784,11 @@ six = "*" [[package]] name = "pillow" -version = "8.4.0" +version = "9.0.0" description = "Python Imaging Library (Fork)" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [[package]] name = "platformdirs" @@ -1575,7 +1575,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes [metadata] lock-version = "1.1" python-versions = "3.7.*" -content-hash = "8bbbb69661d3eefbabf4a18398804bce436a910e61355de66ebefb5c2c23307c" +content-hash = "c933f867533b4ca36b9af3002395bdf6c0de6904a8bbcc38578840b266c54872" [metadata.files] acre = [] @@ -1663,10 +1663,13 @@ babel = [ {file = "Babel-2.9.1.tar.gz", hash = "sha256:bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0"}, ] bcrypt = [ + {file = "bcrypt-3.2.0-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:b589229207630484aefe5899122fb938a5b017b0f4349f769b8c13e78d99a8fd"}, {file = "bcrypt-3.2.0-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:c95d4cbebffafcdd28bd28bb4e25b31c50f6da605c81ffd9ad8a3d1b2ab7b1b6"}, {file = "bcrypt-3.2.0-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:63d4e3ff96188e5898779b6057878fecf3f11cfe6ec3b313ea09955d587ec7a7"}, {file = "bcrypt-3.2.0-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:cd1ea2ff3038509ea95f687256c46b79f5fc382ad0aa3664d200047546d511d1"}, {file = "bcrypt-3.2.0-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:cdcdcb3972027f83fe24a48b1e90ea4b584d35f1cc279d76de6fc4b13376239d"}, + {file = "bcrypt-3.2.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:a0584a92329210fcd75eb8a3250c5a941633f8bfaf2a18f81009b097732839b7"}, + {file = "bcrypt-3.2.0-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:56e5da069a76470679f312a7d3d23deb3ac4519991a0361abc11da837087b61d"}, {file = "bcrypt-3.2.0-cp36-abi3-win32.whl", hash = "sha256:a67fb841b35c28a59cebed05fbd3e80eea26e6d75851f0574a9273c80f3e9b55"}, {file = "bcrypt-3.2.0-cp36-abi3-win_amd64.whl", hash = "sha256:81fec756feff5b6818ea7ab031205e1d323d8943d237303baca2c5f9c7846f34"}, {file = "bcrypt-3.2.0.tar.gz", hash = "sha256:5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"}, @@ -1977,12 +1980,28 @@ log4mongo = [ {file = "log4mongo-1.7.0.tar.gz", hash = "sha256:dc374617206162a0b14167fbb5feac01dbef587539a235dadba6200362984a68"}, ] markupsafe = [ + {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"}, @@ -1991,14 +2010,27 @@ markupsafe = [ {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"}, {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"}, {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"}, {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"}, {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"}, @@ -2008,6 +2040,12 @@ markupsafe = [ {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"}, {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"}, {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"}, {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"}, {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"}, {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"}, @@ -2108,47 +2146,38 @@ pathlib2 = [ {file = "pathlib2-2.3.6.tar.gz", hash = "sha256:7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f"}, ] pillow = [ - {file = "Pillow-8.4.0-cp310-cp310-macosx_10_10_universal2.whl", hash = "sha256:81f8d5c81e483a9442d72d182e1fb6dcb9723f289a57e8030811bac9ea3fef8d"}, - {file = "Pillow-8.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3f97cfb1e5a392d75dd8b9fd274d205404729923840ca94ca45a0af57e13dbe6"}, - {file = "Pillow-8.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eb9fc393f3c61f9054e1ed26e6fe912c7321af2f41ff49d3f83d05bacf22cc78"}, - {file = "Pillow-8.4.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d82cdb63100ef5eedb8391732375e6d05993b765f72cb34311fab92103314649"}, - {file = "Pillow-8.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:62cc1afda735a8d109007164714e73771b499768b9bb5afcbbee9d0ff374b43f"}, - {file = "Pillow-8.4.0-cp310-cp310-win32.whl", hash = "sha256:e3dacecfbeec9a33e932f00c6cd7996e62f53ad46fbe677577394aaa90ee419a"}, - {file = "Pillow-8.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:620582db2a85b2df5f8a82ddeb52116560d7e5e6b055095f04ad828d1b0baa39"}, - {file = "Pillow-8.4.0-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:1bc723b434fbc4ab50bb68e11e93ce5fb69866ad621e3c2c9bdb0cd70e345f55"}, - {file = "Pillow-8.4.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:72cbcfd54df6caf85cc35264c77ede902452d6df41166010262374155947460c"}, - {file = "Pillow-8.4.0-cp36-cp36m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:70ad9e5c6cb9b8487280a02c0ad8a51581dcbbe8484ce058477692a27c151c0a"}, - {file = "Pillow-8.4.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:25a49dc2e2f74e65efaa32b153527fc5ac98508d502fa46e74fa4fd678ed6645"}, - {file = "Pillow-8.4.0-cp36-cp36m-win32.whl", hash = "sha256:93ce9e955cc95959df98505e4608ad98281fff037350d8c2671c9aa86bcf10a9"}, - {file = "Pillow-8.4.0-cp36-cp36m-win_amd64.whl", hash = "sha256:2e4440b8f00f504ee4b53fe30f4e381aae30b0568193be305256b1462216feff"}, - {file = "Pillow-8.4.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:8c803ac3c28bbc53763e6825746f05cc407b20e4a69d0122e526a582e3b5e153"}, - {file = "Pillow-8.4.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c8a17b5d948f4ceeceb66384727dde11b240736fddeda54ca740b9b8b1556b29"}, - {file = "Pillow-8.4.0-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1394a6ad5abc838c5cd8a92c5a07535648cdf6d09e8e2d6df916dfa9ea86ead8"}, - {file = "Pillow-8.4.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:792e5c12376594bfcb986ebf3855aa4b7c225754e9a9521298e460e92fb4a488"}, - {file = "Pillow-8.4.0-cp37-cp37m-win32.whl", hash = "sha256:d99ec152570e4196772e7a8e4ba5320d2d27bf22fdf11743dd882936ed64305b"}, - {file = "Pillow-8.4.0-cp37-cp37m-win_amd64.whl", hash = "sha256:7b7017b61bbcdd7f6363aeceb881e23c46583739cb69a3ab39cb384f6ec82e5b"}, - {file = "Pillow-8.4.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:d89363f02658e253dbd171f7c3716a5d340a24ee82d38aab9183f7fdf0cdca49"}, - {file = "Pillow-8.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0a0956fdc5defc34462bb1c765ee88d933239f9a94bc37d132004775241a7585"}, - {file = "Pillow-8.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5b7bb9de00197fb4261825c15551adf7605cf14a80badf1761d61e59da347779"}, - {file = "Pillow-8.4.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:72b9e656e340447f827885b8d7a15fc8c4e68d410dc2297ef6787eec0f0ea409"}, - {file = "Pillow-8.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a5a4532a12314149d8b4e4ad8ff09dde7427731fcfa5917ff16d0291f13609df"}, - {file = "Pillow-8.4.0-cp38-cp38-win32.whl", hash = "sha256:82aafa8d5eb68c8463b6e9baeb4f19043bb31fefc03eb7b216b51e6a9981ae09"}, - {file = "Pillow-8.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:066f3999cb3b070a95c3652712cffa1a748cd02d60ad7b4e485c3748a04d9d76"}, - {file = "Pillow-8.4.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:5503c86916d27c2e101b7f71c2ae2cddba01a2cf55b8395b0255fd33fa4d1f1a"}, - {file = "Pillow-8.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4acc0985ddf39d1bc969a9220b51d94ed51695d455c228d8ac29fcdb25810e6e"}, - {file = "Pillow-8.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0b052a619a8bfcf26bd8b3f48f45283f9e977890263e4571f2393ed8898d331b"}, - {file = "Pillow-8.4.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:493cb4e415f44cd601fcec11c99836f707bb714ab03f5ed46ac25713baf0ff20"}, - {file = "Pillow-8.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8831cb7332eda5dc89b21a7bce7ef6ad305548820595033a4b03cf3091235ed"}, - {file = "Pillow-8.4.0-cp39-cp39-win32.whl", hash = "sha256:5e9ac5f66616b87d4da618a20ab0a38324dbe88d8a39b55be8964eb520021e02"}, - {file = "Pillow-8.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:3eb1ce5f65908556c2d8685a8f0a6e989d887ec4057326f6c22b24e8a172c66b"}, - {file = "Pillow-8.4.0-pp36-pypy36_pp73-macosx_10_10_x86_64.whl", hash = "sha256:ddc4d832a0f0b4c52fff973a0d44b6c99839a9d016fe4e6a1cb8f3eea96479c2"}, - {file = "Pillow-8.4.0-pp36-pypy36_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9a3e5ddc44c14042f0844b8cf7d2cd455f6cc80fd7f5eefbe657292cf601d9ad"}, - {file = "Pillow-8.4.0-pp36-pypy36_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c70e94281588ef053ae8998039610dbd71bc509e4acbc77ab59d7d2937b10698"}, - {file = "Pillow-8.4.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:3862b7256046fcd950618ed22d1d60b842e3a40a48236a5498746f21189afbbc"}, - {file = "Pillow-8.4.0-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4901622493f88b1a29bd30ec1a2f683782e57c3c16a2dbc7f2595ba01f639df"}, - {file = "Pillow-8.4.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84c471a734240653a0ec91dec0996696eea227eafe72a33bd06c92697728046b"}, - {file = "Pillow-8.4.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:244cf3b97802c34c41905d22810846802a3329ddcb93ccc432870243211c79fc"}, - {file = "Pillow-8.4.0.tar.gz", hash = "sha256:b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed"}, + {file = "Pillow-9.0.0-cp310-cp310-macosx_10_10_universal2.whl", hash = "sha256:113723312215b25c22df1fdf0e2da7a3b9c357a7d24a93ebbe80bfda4f37a8d4"}, + {file = "Pillow-9.0.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:bb47a548cea95b86494a26c89d153fd31122ed65255db5dcbc421a2d28eb3379"}, + {file = "Pillow-9.0.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:31b265496e603985fad54d52d11970383e317d11e18e856971bdbb86af7242a4"}, + {file = "Pillow-9.0.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d154ed971a4cc04b93a6d5b47f37948d1f621f25de3e8fa0c26b2d44f24e3e8f"}, + {file = "Pillow-9.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:80fe92813d208ce8aa7d76da878bdc84b90809f79ccbad2a288e9bcbeac1d9bd"}, + {file = "Pillow-9.0.0-cp310-cp310-win32.whl", hash = "sha256:d5dcea1387331c905405b09cdbfb34611050cc52c865d71f2362f354faee1e9f"}, + {file = "Pillow-9.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:52abae4c96b5da630a8b4247de5428f593465291e5b239f3f843a911a3cf0105"}, + {file = "Pillow-9.0.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:72c3110228944019e5f27232296c5923398496b28be42535e3b2dc7297b6e8b6"}, + {file = "Pillow-9.0.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97b6d21771da41497b81652d44191489296555b761684f82b7b544c49989110f"}, + {file = "Pillow-9.0.0-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:72f649d93d4cc4d8cf79c91ebc25137c358718ad75f99e99e043325ea7d56100"}, + {file = "Pillow-9.0.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7aaf07085c756f6cb1c692ee0d5a86c531703b6e8c9cae581b31b562c16b98ce"}, + {file = "Pillow-9.0.0-cp37-cp37m-win32.whl", hash = "sha256:03b27b197deb4ee400ed57d8d4e572d2d8d80f825b6634daf6e2c18c3c6ccfa6"}, + {file = "Pillow-9.0.0-cp37-cp37m-win_amd64.whl", hash = "sha256:a09a9d4ec2b7887f7a088bbaacfd5c07160e746e3d47ec5e8050ae3b2a229e9f"}, + {file = "Pillow-9.0.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:490e52e99224858f154975db61c060686df8a6b3f0212a678e5d2e2ce24675c9"}, + {file = "Pillow-9.0.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:500d397ddf4bbf2ca42e198399ac13e7841956c72645513e8ddf243b31ad2128"}, + {file = "Pillow-9.0.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ebd8b9137630a7bbbff8c4b31e774ff05bbb90f7911d93ea2c9371e41039b52"}, + {file = "Pillow-9.0.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd0e5062f11cb3e730450a7d9f323f4051b532781026395c4323b8ad055523c4"}, + {file = "Pillow-9.0.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9f3b4522148586d35e78313db4db0df4b759ddd7649ef70002b6c3767d0fdeb7"}, + {file = "Pillow-9.0.0-cp38-cp38-win32.whl", hash = "sha256:0b281fcadbb688607ea6ece7649c5d59d4bbd574e90db6cd030e9e85bde9fecc"}, + {file = "Pillow-9.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:b5050d681bcf5c9f2570b93bee5d3ec8ae4cf23158812f91ed57f7126df91762"}, + {file = "Pillow-9.0.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:c2067b3bb0781f14059b112c9da5a91c80a600a97915b4f48b37f197895dd925"}, + {file = "Pillow-9.0.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2d16b6196fb7a54aff6b5e3ecd00f7c0bab1b56eee39214b2b223a9d938c50af"}, + {file = "Pillow-9.0.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:98cb63ca63cb61f594511c06218ab4394bf80388b3d66cd61d0b1f63ee0ea69f"}, + {file = "Pillow-9.0.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bc462d24500ba707e9cbdef436c16e5c8cbf29908278af053008d9f689f56dee"}, + {file = "Pillow-9.0.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3586e12d874ce2f1bc875a3ffba98732ebb12e18fb6d97be482bd62b56803281"}, + {file = "Pillow-9.0.0-cp39-cp39-win32.whl", hash = "sha256:68e06f8b2248f6dc8b899c3e7ecf02c9f413aab622f4d6190df53a78b93d97a5"}, + {file = "Pillow-9.0.0-cp39-cp39-win_amd64.whl", hash = "sha256:6579f9ba84a3d4f1807c4aab4be06f373017fc65fff43498885ac50a9b47a553"}, + {file = "Pillow-9.0.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:47f5cf60bcb9fbc46011f75c9b45a8b5ad077ca352a78185bd3e7f1d294b98bb"}, + {file = "Pillow-9.0.0-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2fd8053e1f8ff1844419842fd474fc359676b2e2a2b66b11cc59f4fa0a301315"}, + {file = "Pillow-9.0.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c5439bfb35a89cac50e81c751317faea647b9a3ec11c039900cd6915831064d"}, + {file = "Pillow-9.0.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:95545137fc56ce8c10de646074d242001a112a92de169986abd8c88c27566a05"}, + {file = "Pillow-9.0.0.tar.gz", hash = "sha256:ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e"}, ] platformdirs = [ {file = "platformdirs-2.4.0-py3-none-any.whl", hash = "sha256:8868bbe3c3c80d42f20156f22e7131d2fb321f5bc86a2a345375c6481a67021d"}, @@ -2397,6 +2426,8 @@ pynput = [ ] pyobjc-core = [ {file = "pyobjc-core-7.3.tar.gz", hash = "sha256:5081aedf8bb40aac1a8ad95adac9e44e148a882686ded614adf46bb67fd67574"}, + {file = "pyobjc_core-7.3-1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a1f1e6b457127cbf2b5bd2b94520a7c89fb590b739911eadb2b0499a3a5b0e6f"}, + {file = "pyobjc_core-7.3-1-cp38-cp38-macosx_11_0_universal2.whl", hash = "sha256:ed708cc47bae8b711f81f252af09898a5f986c7a38cec5ad5623d571d328bff8"}, {file = "pyobjc_core-7.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:4e93ad769a20b908778fe950f62a843a6d8f0fa71996e5f3cc9fab5ae7d17771"}, {file = "pyobjc_core-7.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:9f63fd37bbf3785af4ddb2f86cad5ca81c62cfc7d1c0099637ca18343c3656c1"}, {file = "pyobjc_core-7.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e9b1311f72f2e170742a7ee3a8149f52c35158dc024a21e88d6f1e52ba5d718b"}, @@ -2415,6 +2446,8 @@ pyobjc-framework-applicationservices = [ ] pyobjc-framework-cocoa = [ {file = "pyobjc-framework-Cocoa-7.3.tar.gz", hash = "sha256:b18d05e7a795a3455ad191c3e43d6bfa673c2a4fd480bb1ccf57191051b80b7e"}, + {file = "pyobjc_framework_Cocoa-7.3-1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1e31376806e5de883a1d7c7c87d9ff2a8b09fc05d267e0dfce6e42409fb70c67"}, + {file = "pyobjc_framework_Cocoa-7.3-1-cp38-cp38-macosx_11_0_universal2.whl", hash = "sha256:d999387927284346035cb63ebb51f86331abc41f9376f9a6970e7f18207db392"}, {file = "pyobjc_framework_Cocoa-7.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:9edffdfa6dd1f71f21b531c3e61fdd3e4d5d3bf6c5a528c98e88828cd60bac11"}, {file = "pyobjc_framework_Cocoa-7.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:35a6340437a4e0109a302150b7d1f6baf57004ccf74834f9e6062fcafe2fd8d7"}, {file = "pyobjc_framework_Cocoa-7.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7c3886f2608ab3ed02482f8b2ebf9f782b324c559e84b52cfd92dba8a1109872"}, @@ -2423,6 +2456,8 @@ pyobjc-framework-cocoa = [ ] pyobjc-framework-quartz = [ {file = "pyobjc-framework-Quartz-7.3.tar.gz", hash = "sha256:98812844c34262def980bdf60923a875cd43428a8375b6fd53bd2cd800eccf0b"}, + {file = "pyobjc_framework_Quartz-7.3-1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1139bc6874c0f8b58f0b8602015e0994198bc506a6bcec1071208de32b55ed26"}, + {file = "pyobjc_framework_Quartz-7.3-1-cp38-cp38-macosx_11_0_universal2.whl", hash = "sha256:d94a3ed7051266c52392ec07d3b5adbf28d4be83341a24df0d88639344dcd84f"}, {file = "pyobjc_framework_Quartz-7.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1ef18f5a16511ded65980bf4f5983ea5d35c88224dbad1b3112abd29c60413ea"}, {file = "pyobjc_framework_Quartz-7.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3b41eec8d4b10c7c7e011e2f9051367f5499ef315ba52dfbae573c3a2e05469c"}, {file = "pyobjc_framework_Quartz-7.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2c65456ed045dfe1711d0298734e5a3ad670f8c770f7eb3b19979256c388bdd2"}, From e836416513477d9640c64e26c6066a6a8db3398e Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 26 Jan 2022 17:56:19 +0100 Subject: [PATCH 107/123] OP-1117 - cleaned up use of default value --- openpype/hooks/pre_add_last_workfile_arg.py | 2 +- openpype/hooks/pre_global_host_data.py | 2 +- openpype/hooks/pre_non_python_host_launch.py | 2 +- openpype/lib/applications.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openpype/hooks/pre_add_last_workfile_arg.py b/openpype/hooks/pre_add_last_workfile_arg.py index 048545a150..653f97b3dd 100644 --- a/openpype/hooks/pre_add_last_workfile_arg.py +++ b/openpype/hooks/pre_add_last_workfile_arg.py @@ -25,7 +25,7 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook): ] def execute(self): - if not self.data.get("start_last_workfile", True): + if not self.data.get("start_last_workfile"): self.log.info("It is set to not start last workfile on start.") return diff --git a/openpype/hooks/pre_global_host_data.py b/openpype/hooks/pre_global_host_data.py index 3f56c47a42..bae967e25f 100644 --- a/openpype/hooks/pre_global_host_data.py +++ b/openpype/hooks/pre_global_host_data.py @@ -43,7 +43,7 @@ class GlobalHostDataHook(PreLaunchHook): "env": self.launch_context.env, - "start_last_workfile": self.data.get("start_last_workfile", True), + "start_last_workfile": self.data.get("start_last_workfile"), "last_workfile_path": self.data.get("last_workfile_path"), "log": self.log diff --git a/openpype/hooks/pre_non_python_host_launch.py b/openpype/hooks/pre_non_python_host_launch.py index 5bbc0a4834..dd193616e6 100644 --- a/openpype/hooks/pre_non_python_host_launch.py +++ b/openpype/hooks/pre_non_python_host_launch.py @@ -41,7 +41,7 @@ class NonPythonHostHook(PreLaunchHook): # Add workfile path if exists workfile_path = self.data["last_workfile_path"] if ( - self.data.get("start_last_workfile", True) + self.data.get("start_last_workfile") and workfile_path and os.path.exists(workfile_path)): new_launch_args.append(workfile_path) diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py index 930b433ac0..a704c3ae68 100644 --- a/openpype/lib/applications.py +++ b/openpype/lib/applications.py @@ -1505,8 +1505,8 @@ def _prepare_last_workfile(data, workdir): task_name = data["task_name"] task_type = data["task_type"] - start_last_workfile = data.get("start_last_workfile", True) - if start_last_workfile: + start_last_workfile = data.get("start_last_workfile") + if start_last_workfile is None: start_last_workfile = should_start_last_workfile( project_name, app.host_name, task_name, task_type ) From e68b9acb1ed018fb0d129d2c5a2453e58d309480 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 26 Jan 2022 18:04:16 +0100 Subject: [PATCH 108/123] Update openpype/tools/launcher/widgets.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/tools/launcher/widgets.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openpype/tools/launcher/widgets.py b/openpype/tools/launcher/widgets.py index beff2548f2..ce3f128496 100644 --- a/openpype/tools/launcher/widgets.py +++ b/openpype/tools/launcher/widgets.py @@ -241,6 +241,8 @@ class ActionBar(QtWidgets.QWidget): action = index.data(ACTION_ROLE) if index.data(FORCE_NOT_OPEN_WORKFILE_ROLE): action.data["start_last_workfile"] = False + else: + action.data.pop("start_last_workfile", None) self._start_animation(index) self.action_clicked.emit(action) return From 2c33b335a9d1eb9c9475e98c4c6b44ca578dea5c Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Thu, 27 Jan 2022 16:38:13 +0100 Subject: [PATCH 109/123] added thumbnail extractor for webpublisher --- .../plugins/publish/extract_thumbnail.py | 139 ++++++++++++++++++ openpype/plugins/publish/extract_jpeg_exr.py | 2 +- 2 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 openpype/hosts/webpublisher/plugins/publish/extract_thumbnail.py diff --git a/openpype/hosts/webpublisher/plugins/publish/extract_thumbnail.py b/openpype/hosts/webpublisher/plugins/publish/extract_thumbnail.py new file mode 100644 index 0000000000..cb6ed8481c --- /dev/null +++ b/openpype/hosts/webpublisher/plugins/publish/extract_thumbnail.py @@ -0,0 +1,139 @@ +import os +import shutil + +import pyblish.api +from openpype.lib import ( + get_ffmpeg_tool_path, + + run_subprocess, + + get_transcode_temp_directory, + convert_for_ffmpeg, + should_convert_for_ffmpeg +) + + +class ExtractThumbnail(pyblish.api.InstancePlugin): + """Create jpg thumbnail from input using ffmpeg.""" + + label = "Extract Thumbnail" + order = pyblish.api.ExtractorOrder + families = [ + "render", + "image" + ] + hosts = ["webpublisher"] + targets = ["filespublish"] + + def process(self, instance): + self.log.info("subset {}".format(instance.data['subset'])) + + filtered_repres = self._get_filtered_repres(instance) + for repre in filtered_repres: + repre_files = repre["files"] + if not isinstance(repre_files, (list, tuple)): + input_file = repre_files + else: + file_index = int(float(len(repre_files)) * 0.5) + input_file = repre_files[file_index] + + stagingdir = os.path.normpath(repre["stagingDir"]) + + full_input_path = os.path.join(stagingdir, input_file) + self.log.info("Input filepath: {}".format(full_input_path)) + + do_convert = should_convert_for_ffmpeg(full_input_path) + # If result is None the requirement of conversion can't be + # determined + if do_convert is None: + self.log.info(( + "Can't determine if representation requires conversion." + " Skipped." + )) + continue + + # Do conversion if needed + # - change staging dir of source representation + # - must be set back after output definitions processing + convert_dir = None + if do_convert: + convert_dir = get_transcode_temp_directory() + filename = os.path.basename(full_input_path) + convert_for_ffmpeg( + full_input_path, + convert_dir, + None, + None, + self.log + ) + full_input_path = os.path.join(convert_dir, filename) + + filename = os.path.splitext(input_file)[0] + while filename.endswith("."): + filename = filename[:-1] + thumbnail_filename = filename + "_thumbnail.jpg" + full_output_path = os.path.join(stagingdir, thumbnail_filename) + + self.log.info("output {}".format(full_output_path)) + + ffmpeg_args = [ + get_ffmpeg_tool_path("ffmpeg"), + "-y", + "-i", full_input_path, + "-vframes", "1", + full_output_path + ] + + # run subprocess + self.log.debug("{}".format(" ".join(ffmpeg_args))) + try: # temporary until oiiotool is supported cross platform + run_subprocess( + ffmpeg_args, logger=self.log + ) + except RuntimeError as exp: + if "Compression" in str(exp): + self.log.debug( + "Unsupported compression on input files. Skipping!!!" + ) + return + self.log.warning("Conversion crashed", exc_info=True) + raise + + new_repre = { + "name": "thumbnail", + "ext": "jpg", + "files": thumbnail_filename, + "stagingDir": stagingdir, + "thumbnail": True, + "tags": ["thumbnail"] + } + + # adding representation + self.log.debug("Adding: {}".format(new_repre)) + instance.data["representations"].append(new_repre) + + # Cleanup temp folder + if convert_dir is not None and os.path.exists(convert_dir): + shutil.rmtree(convert_dir) + + def _get_filtered_repres(self, instance): + filtered_repres = [] + repres = instance.data.get("representations") or [] + for repre in repres: + self.log.debug(repre) + tags = repre.get("tags") or [] + # Skip instance if already has thumbnail representation + if "thumbnail" in tags: + return [] + + if "review" not in tags: + continue + + if not repre.get("files"): + self.log.info(( + "Representation \"{}\" don't have files. Skipping" + ).format(repre["name"])) + continue + + filtered_repres.append(repre) + return filtered_repres diff --git a/openpype/plugins/publish/extract_jpeg_exr.py b/openpype/plugins/publish/extract_jpeg_exr.py index 3cb4f8f9cb..d80b7bb9c3 100644 --- a/openpype/plugins/publish/extract_jpeg_exr.py +++ b/openpype/plugins/publish/extract_jpeg_exr.py @@ -24,7 +24,7 @@ class ExtractJpegEXR(pyblish.api.InstancePlugin): "imagesequence", "render", "render2d", "source", "plate", "take" ] - hosts = ["shell", "fusion", "resolve", "webpublisher"] + hosts = ["shell", "fusion", "resolve"] enabled = False # presetable attribute From a58865363faa7331e210ee06bea6acfe0ca792a4 Mon Sep 17 00:00:00 2001 From: OpenPype Date: Sat, 29 Jan 2022 03:38:41 +0000 Subject: [PATCH 110/123] [Automated] Bump version --- CHANGELOG.md | 17 ++++++----------- openpype/version.py | 2 +- pyproject.toml | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7741122f6..1a90f2ce01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,21 +1,26 @@ # Changelog -## [3.8.1-nightly.1](https://github.com/pypeclub/OpenPype/tree/HEAD) +## [3.8.1-nightly.2](https://github.com/pypeclub/OpenPype/tree/HEAD) [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.8.0...HEAD) **🚀 Enhancements** +- Webpublisher: Thumbnail extractor [\#2600](https://github.com/pypeclub/OpenPype/pull/2600) - Loader: Allow to toggle default family filters between "include" or "exclude" filtering [\#2541](https://github.com/pypeclub/OpenPype/pull/2541) **🐛 Bug fixes** +- switch distutils to sysconfig for `get\_platform\(\)` [\#2594](https://github.com/pypeclub/OpenPype/pull/2594) +- Fix poetry index and speedcopy update [\#2589](https://github.com/pypeclub/OpenPype/pull/2589) - Webpublisher: Fix - subset names from processed .psd used wrong value for task [\#2586](https://github.com/pypeclub/OpenPype/pull/2586) - `vrscene` creator Deadline webservice URL handling [\#2580](https://github.com/pypeclub/OpenPype/pull/2580) - global: track name was failing if duplicated root word in name [\#2568](https://github.com/pypeclub/OpenPype/pull/2568) +- Validate Maya Rig produces no cycle errors [\#2484](https://github.com/pypeclub/OpenPype/pull/2484) **Merged pull requests:** +- Bump pillow from 8.4.0 to 9.0.0 [\#2595](https://github.com/pypeclub/OpenPype/pull/2595) - build\(deps\): bump pillow from 8.4.0 to 9.0.0 [\#2523](https://github.com/pypeclub/OpenPype/pull/2523) ## [3.8.0](https://github.com/pypeclub/OpenPype/tree/3.8.0) (2022-01-24) @@ -49,7 +54,6 @@ - Slack: notifications are sent with Openpype logo and bot name [\#2499](https://github.com/pypeclub/OpenPype/pull/2499) - Slack: Add review to notification message [\#2498](https://github.com/pypeclub/OpenPype/pull/2498) - Maya: Collect 'fps' animation data only for "review" instances [\#2486](https://github.com/pypeclub/OpenPype/pull/2486) -- General: Validate third party before build [\#2425](https://github.com/pypeclub/OpenPype/pull/2425) **🐛 Bug fixes** @@ -87,15 +91,6 @@ **🚀 Enhancements** - General: Workdir extra folders [\#2462](https://github.com/pypeclub/OpenPype/pull/2462) -- Photoshop: New style validations for New publisher [\#2429](https://github.com/pypeclub/OpenPype/pull/2429) - -**🐛 Bug fixes** - -- Short Pyblish plugin path [\#2428](https://github.com/pypeclub/OpenPype/pull/2428) - -**Merged pull requests:** - -- Forced cx\_freeze to include sqlite3 into build [\#2432](https://github.com/pypeclub/OpenPype/pull/2432) ## [3.6.4](https://github.com/pypeclub/OpenPype/tree/3.6.4) (2021-11-23) diff --git a/openpype/version.py b/openpype/version.py index 60daa4f54f..7e19430e70 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.8.1-nightly.1" +__version__ = "3.8.1-nightly.2" diff --git a/pyproject.toml b/pyproject.toml index 8b839f4dc6..8ef0c1b52e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "OpenPype" -version = "3.8.1-nightly.1" # OpenPype +version = "3.8.1-nightly.2" # OpenPype description = "Open VFX and Animation pipeline with support." authors = ["OpenPype Team "] license = "MIT License" From af652e0d42ac7535518224dd20abd6e175f70604 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sun, 30 Jan 2022 21:32:44 +0100 Subject: [PATCH 111/123] Remove double 'project' in label --- openpype/tools/settings/settings/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/tools/settings/settings/base.py b/openpype/tools/settings/settings/base.py index e271585852..6a8d123617 100644 --- a/openpype/tools/settings/settings/base.py +++ b/openpype/tools/settings/settings/base.py @@ -168,7 +168,7 @@ class BaseWidget(QtWidgets.QWidget): with self.category_widget.working_state_context(): self.entity.add_to_project_override - action = QtWidgets.QAction("Add to project project override") + action = QtWidgets.QAction("Add to project override") actions_mapping[action] = add_to_project_override menu.addAction(action) From 20bc784698a9b148b9da4985c36f08ac4fb0b39b Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sun, 30 Jan 2022 22:03:34 +0100 Subject: [PATCH 112/123] Fix typos/grammar mistakes. --- openpype/tools/assetcreator/app.py | 4 ++-- openpype/tools/assetcreator/widget.py | 6 +++--- openpype/tools/context_dialog/window.py | 2 +- openpype/tools/creator/window.py | 2 +- openpype/tools/experimental_tools/dialog.py | 2 +- openpype/tools/experimental_tools/tools_def.py | 2 +- openpype/tools/launcher/lib.py | 4 ++-- openpype/tools/launcher/models.py | 2 +- openpype/tools/launcher/widgets.py | 6 +++--- openpype/tools/loader/app.py | 4 ++-- openpype/tools/loader/lib.py | 2 +- openpype/tools/mayalookassigner/widgets.py | 4 ++-- .../project_manager/project_manager/model.py | 12 ++++++------ .../project_manager/multiselection_combobox.py | 2 +- openpype/tools/publisher/control.py | 4 ++-- .../publisher/widgets/border_label_widget.py | 6 +++--- .../tools/publisher/widgets/card_view_widgets.py | 2 +- .../tools/publisher/widgets/list_view_widgets.py | 6 +++--- .../publisher/widgets/validations_widget.py | 2 +- openpype/tools/publisher/widgets/widgets.py | 16 ++++++++-------- openpype/tools/pyblish_pype/control.py | 10 +++++----- openpype/tools/pyblish_pype/util.py | 2 +- openpype/tools/sceneinventory/window.py | 2 +- .../tools/settings/local_settings/constants.py | 2 +- openpype/tools/settings/local_settings/window.py | 2 +- openpype/tools/settings/settings/README.md | 4 ++-- openpype/tools/settings/settings/base.py | 2 +- openpype/tools/settings/settings/item_widgets.py | 6 +++--- openpype/tools/settings/settings/lib.py | 2 +- .../settings/settings/list_strict_widget.py | 2 +- .../settings/settings/multiselection_combobox.py | 2 +- openpype/tools/settings/settings/window.py | 2 +- openpype/tools/standalonepublish/app.py | 2 +- .../standalonepublish/widgets/model_asset.py | 2 +- .../standalonepublish/widgets/widget_asset.py | 6 +++--- .../widgets/widget_drop_frame.py | 2 +- .../standalonepublish/widgets/widget_family.py | 2 +- openpype/tools/tray/pype_info_widget.py | 2 +- openpype/tools/tray/pype_tray.py | 6 +++--- openpype/tools/tray_app/app.py | 2 +- openpype/tools/utils/host_tools.py | 6 +++--- openpype/tools/utils/lib.py | 6 +++--- openpype/tools/utils/widgets.py | 2 +- openpype/tools/workfiles/app.py | 10 +++++----- 44 files changed, 88 insertions(+), 88 deletions(-) diff --git a/openpype/tools/assetcreator/app.py b/openpype/tools/assetcreator/app.py index 58697e8aa3..1d332d647e 100644 --- a/openpype/tools/assetcreator/app.py +++ b/openpype/tools/assetcreator/app.py @@ -87,7 +87,7 @@ class Window(QtWidgets.QDialog): btn_layout = QtWidgets.QHBoxLayout(btns_widget) btn_create_asset = QtWidgets.QPushButton("Create asset") btn_create_asset.setToolTip( - "Creates all neccessary components for asset" + "Creates all necessary components for asset" ) checkbox_app = None if self.context is not None: @@ -231,7 +231,7 @@ class Window(QtWidgets.QDialog): test_name = name.replace(' ', '') error_message = None message = QtWidgets.QMessageBox(self) - message.setWindowTitle("Some errors has occured") + message.setWindowTitle("Some errors have occurred") message.setIcon(QtWidgets.QMessageBox.Critical) # TODO: show error messages on any error if self.valid_parent is not True and test_name == '': diff --git a/openpype/tools/assetcreator/widget.py b/openpype/tools/assetcreator/widget.py index 1e9e4ab624..fd0f438e68 100644 --- a/openpype/tools/assetcreator/widget.py +++ b/openpype/tools/assetcreator/widget.py @@ -44,7 +44,7 @@ def preserve_expanded_rows(tree_view, This function is created to maintain the expand vs collapse status of the model items. When refresh is triggered the items which are expanded - will stay expanded and vise versa. + will stay expanded and vice versa. Arguments: tree_view (QWidgets.QTreeView): the tree view which is @@ -94,7 +94,7 @@ def preserve_selection(tree_view, This function is created to maintain the selection status of the model items. When refresh is triggered the items which are expanded - will stay expanded and vise versa. + will stay expanded and vice versa. tree_view (QWidgets.QTreeView): the tree view nested in the application column (int): the column to retrieve the data from @@ -179,7 +179,7 @@ class AssetModel(TreeModel): """ if silos: # WARNING: Silo item "_id" is set to silo value - # mainly because GUI issue with perserve selection and expanded row + # mainly because GUI issue with preserve selection and expanded row # and because of easier hierarchy parenting (in "assets") for silo in silos: item = Item({ diff --git a/openpype/tools/context_dialog/window.py b/openpype/tools/context_dialog/window.py index 5d8a2ad62e..c8464faa3e 100644 --- a/openpype/tools/context_dialog/window.py +++ b/openpype/tools/context_dialog/window.py @@ -46,7 +46,7 @@ class ContextDialog(QtWidgets.QDialog): # UI initialization main_splitter = QtWidgets.QSplitter(self) - # Left side widget containt project combobox and asset widget + # Left side widget contains project combobox and asset widget left_side_widget = QtWidgets.QWidget(main_splitter) project_combobox = QtWidgets.QComboBox(left_side_widget) diff --git a/openpype/tools/creator/window.py b/openpype/tools/creator/window.py index 22a6d5ce9c..f1d0849dfe 100644 --- a/openpype/tools/creator/window.py +++ b/openpype/tools/creator/window.py @@ -354,7 +354,7 @@ class CreatorWindow(QtWidgets.QDialog): Override keyPressEvent to do nothing so that Maya's panels won't take focus when pressing "SHIFT" whilst mouse is over viewport or - outliner. This way users don't accidently perform Maya commands + outliner. This way users don't accidentally perform Maya commands whilst trying to name an instance. """ diff --git a/openpype/tools/experimental_tools/dialog.py b/openpype/tools/experimental_tools/dialog.py index ad65caa8e3..295afbe68d 100644 --- a/openpype/tools/experimental_tools/dialog.py +++ b/openpype/tools/experimental_tools/dialog.py @@ -107,7 +107,7 @@ class ExperimentalToolsDialog(QtWidgets.QDialog): # Is dialog first shown self._first_show = True - # Trigger refresh when window get's activity + # Trigger refresh when window gets activity self._refresh_on_active = True # Is window active self._window_is_active = False diff --git a/openpype/tools/experimental_tools/tools_def.py b/openpype/tools/experimental_tools/tools_def.py index 991eb5e4a3..316359c0f3 100644 --- a/openpype/tools/experimental_tools/tools_def.py +++ b/openpype/tools/experimental_tools/tools_def.py @@ -43,7 +43,7 @@ class ExperimentalTool: self._enabled = enabled def execute(self): - """Trigger registerd callback.""" + """Trigger registered callback.""" self.callback() diff --git a/openpype/tools/launcher/lib.py b/openpype/tools/launcher/lib.py index d6374f49d2..4d678b96ae 100644 --- a/openpype/tools/launcher/lib.py +++ b/openpype/tools/launcher/lib.py @@ -29,7 +29,7 @@ class ProjectHandler(QtCore.QObject): Helps to organize two separate widgets handling current project selection. It is easier to trigger project change callbacks from one place than from - multiple differect places without proper handling or sequence changes. + multiple different places without proper handling or sequence changes. Args: dbcon(AvalonMongoDB): Mongo connection with Session. @@ -42,7 +42,7 @@ class ProjectHandler(QtCore.QObject): # that may require reshing of projects refresh_interval = 10000 - # Signal emmited when project has changed + # Signal emitted when project has changed project_changed = QtCore.Signal(str) projects_refreshed = QtCore.Signal() timer_timeout = QtCore.Signal() diff --git a/openpype/tools/launcher/models.py b/openpype/tools/launcher/models.py index 427475cb4b..42ad509854 100644 --- a/openpype/tools/launcher/models.py +++ b/openpype/tools/launcher/models.py @@ -102,7 +102,7 @@ class ActionModel(QtGui.QStandardItemModel): # Groups group_name = getattr(action, "group", None) - # Lable variants + # Label variants label = getattr(action, "label", None) label_variant = getattr(action, "label_variant", None) if label_variant and not label: diff --git a/openpype/tools/launcher/widgets.py b/openpype/tools/launcher/widgets.py index edda8d08b5..55232c4d1d 100644 --- a/openpype/tools/launcher/widgets.py +++ b/openpype/tools/launcher/widgets.py @@ -171,7 +171,7 @@ class ActionBar(QtWidgets.QWidget): self.update() def _start_animation(self, index): - # Offset refresh timout + # Offset refresh timeout self.project_handler.start_timer() action_id = index.data(ACTION_ID_ROLE) item = self.model.items_by_id.get(action_id) @@ -193,7 +193,7 @@ class ActionBar(QtWidgets.QWidget): self.action_clicked.emit(action) return - # Offset refresh timout + # Offset refresh timeout self.project_handler.start_timer() actions = index.data(ACTION_ROLE) @@ -212,7 +212,7 @@ class ActionBar(QtWidgets.QWidget): by_variant_label = collections.defaultdict(list) orders = [] for action in actions: - # Lable variants + # Label variants label = getattr(action, "label", None) label_variant = getattr(action, "label_variant", None) if label_variant and not label: diff --git a/openpype/tools/loader/app.py b/openpype/tools/loader/app.py index 62bf5538de..1d5dee21f3 100644 --- a/openpype/tools/loader/app.py +++ b/openpype/tools/loader/app.py @@ -27,7 +27,7 @@ module.window = None # Register callback on task change # - callback can't be defined in Window as it is weak reference callback -# so `WeakSet` will remove it immidiatelly +# so `WeakSet` will remove it immediately def on_context_task_change(*args, **kwargs): if module.window: module.window.on_context_task_change(*args, **kwargs) @@ -455,7 +455,7 @@ class LoaderWindow(QtWidgets.QDialog): shift_pressed = QtCore.Qt.ShiftModifier & modifiers if shift_pressed: - print("Force quitted..") + print("Force quit..") self.setAttribute(QtCore.Qt.WA_DeleteOnClose) print("Good bye") diff --git a/openpype/tools/loader/lib.py b/openpype/tools/loader/lib.py index 14ebab6c85..8f18c01913 100644 --- a/openpype/tools/loader/lib.py +++ b/openpype/tools/loader/lib.py @@ -46,7 +46,7 @@ def get_options(action, loader, parent, repre_contexts): Args: action (OptionalAction) - action in menu - loader (cls of api.Loader) - not initilized yet + loader (cls of api.Loader) - not initialized yet parent (Qt element to parent dialog to) repre_contexts (list) of dict with full info about selected repres Returns: diff --git a/openpype/tools/mayalookassigner/widgets.py b/openpype/tools/mayalookassigner/widgets.py index fceaf27244..c78fcc460e 100644 --- a/openpype/tools/mayalookassigner/widgets.py +++ b/openpype/tools/mayalookassigner/widgets.py @@ -233,8 +233,8 @@ class LookOutliner(QtWidgets.QWidget): list: list of dictionaries """ - datas = [i.data(TreeModel.ItemRole) for i in self.view.get_indices()] - return [d for d in datas if d is not None] + items = [i.data(TreeModel.ItemRole) for i in self.view.get_indices()] + return [item for item in items if item is not None] def right_mouse_menu(self, pos): """Build RMB menu for look view""" diff --git a/openpype/tools/project_manager/project_manager/model.py b/openpype/tools/project_manager/project_manager/model.py index 0c02872b4c..1c3ec089f6 100644 --- a/openpype/tools/project_manager/project_manager/model.py +++ b/openpype/tools/project_manager/project_manager/model.py @@ -124,12 +124,12 @@ class HierarchyModel(QtCore.QAbstractItemModel): Main part of ProjectManager. Model should be able to load existing entities, create new, handle their - validations like name duplication and validate if is possible to save it's + validations like name duplication and validate if is possible to save its data. Args: dbcon (AvalonMongoDB): Connection to MongoDB with set AVALON_PROJECT in - it's Session to current project. + its Session to current project. """ # Definition of all possible columns with their labels in default order @@ -799,7 +799,7 @@ class HierarchyModel(QtCore.QAbstractItemModel): for row in range(parent_item.rowCount()): child_item = parent_item.child(row) child_id = child_item.id - # Not sure if this can happend + # Not sure if this can happen # TODO validate this line it seems dangerous as start/end # row is not changed if child_id not in children: @@ -1902,7 +1902,7 @@ class AssetItem(BaseItem): return self._data["name"] def child_parents(self): - """Chilren AssetItem can use this method to get it's parent names. + """Children AssetItem can use this method to get it's parent names. This is used for `data.parents` key on document. """ @@ -2006,7 +2006,7 @@ class AssetItem(BaseItem): @classmethod def data_from_doc(cls, asset_doc): """Convert asset document from Mongo to item data.""" - # Minimum required data for cases that it is new AssetItem withoud doc + # Minimum required data for cases that it is new AssetItem without doc data = { "name": None, "type": "asset" @@ -2253,7 +2253,7 @@ class TaskItem(BaseItem): """Item representing Task item on Asset document. Always should be AssetItem children and never should have any other - childrens. + children. It's name value should be validated with it's parent which only knows if has same name as other sibling under same parent. diff --git a/openpype/tools/project_manager/project_manager/multiselection_combobox.py b/openpype/tools/project_manager/project_manager/multiselection_combobox.py index b26976d3c6..890567de6d 100644 --- a/openpype/tools/project_manager/project_manager/multiselection_combobox.py +++ b/openpype/tools/project_manager/project_manager/multiselection_combobox.py @@ -110,7 +110,7 @@ class MultiSelectionComboBox(QtWidgets.QComboBox): elif event.type() == QtCore.QEvent.KeyPress: # TODO: handle QtCore.Qt.Key_Enter, Key_Return? if event.key() == QtCore.Qt.Key_Space: - # toogle the current items check state + # toggle the current items check state if ( index_flags & QtCore.Qt.ItemIsUserCheckable and index_flags & QtCore.Qt.ItemIsTristate diff --git a/openpype/tools/publisher/control.py b/openpype/tools/publisher/control.py index 860c009f15..3dd1bd6dc9 100644 --- a/openpype/tools/publisher/control.py +++ b/openpype/tools/publisher/control.py @@ -555,7 +555,7 @@ class PublisherController: self.create_context.reset_avalon_context() self._reset_plugins() - # Publish part must be resetted after plugins + # Publish part must be reset after plugins self._reset_publish() self._reset_instances() @@ -690,7 +690,7 @@ class PublisherController: def remove_instances(self, instances): """""" - # QUESTION Expect that instaces are really removed? In that case save + # QUESTION Expect that instances are really removed? In that case save # reset is not required and save changes too. self.save_changes() diff --git a/openpype/tools/publisher/widgets/border_label_widget.py b/openpype/tools/publisher/widgets/border_label_widget.py index 3d49af410a..696a9050b8 100644 --- a/openpype/tools/publisher/widgets/border_label_widget.py +++ b/openpype/tools/publisher/widgets/border_label_widget.py @@ -51,7 +51,7 @@ class _HBottomLineWidget(QtWidgets.QWidget): Corners may have curve set by radius (`set_radius`). Radius should expect height of widget. - Bottom line is drawed at the bottom of widget. If radius is 0 then height + Bottom line is drawn at the bottom of widget. If radius is 0 then height of widget should be 1px. It is expected that parent widget will set height and radius. @@ -94,7 +94,7 @@ class _HTopCornerLineWidget(QtWidgets.QWidget): or ```┌───────``` - Horizontal line is drawed in the middle of widget. + Horizontal line is drawn in the middle of widget. Widget represents left or right corner. Corner may have curve set by radius (`set_radius`). Radius should expect height of widget (maximum half @@ -225,7 +225,7 @@ class BorderedLabelWidget(QtWidgets.QFrame): self._radius = radius side_width = 1 + radius - # Dont't use fixed width/height as that would set also set + # Don't use fixed width/height as that would set also set # the other size (When fixed width is set then is also set # fixed height). self._left_w.setMinimumWidth(side_width) diff --git a/openpype/tools/publisher/widgets/card_view_widgets.py b/openpype/tools/publisher/widgets/card_view_widgets.py index 271d06e94c..ff0dfc95ab 100644 --- a/openpype/tools/publisher/widgets/card_view_widgets.py +++ b/openpype/tools/publisher/widgets/card_view_widgets.py @@ -388,7 +388,7 @@ class InstanceCardView(AbstractInstanceView): def sizeHint(self): """Modify sizeHint based on visibility of scroll bars.""" - # Calculate width hint by content widget and verticall scroll bar + # Calculate width hint by content widget and vertical scroll bar scroll_bar = self._scroll_area.verticalScrollBar() width = ( self._content_widget.sizeHint().width() diff --git a/openpype/tools/publisher/widgets/list_view_widgets.py b/openpype/tools/publisher/widgets/list_view_widgets.py index 4b2082e523..23a86cd070 100644 --- a/openpype/tools/publisher/widgets/list_view_widgets.py +++ b/openpype/tools/publisher/widgets/list_view_widgets.py @@ -6,7 +6,7 @@ attribute on instance (Group defined by creator). Each item can be enabled/disabled with their checkbox, whole group can be enabled/disabled with checkbox on group or selection can be enabled disabled using checkbox or keyboard key presses: -- Space - change state of selection to oposite +- Space - change state of selection to opposite - Enter - enable selection - Backspace - disable selection @@ -589,7 +589,7 @@ class InstanceListView(AbstractInstanceView): # - create new instance, update existing and remove not existing for group_name, group_item in self._group_items.items(): # Instance items to remove - # - will contain all exising instance ids at the start + # - will contain all existing instance ids at the start # - instance ids may be removed when existing instances are checked to_remove = set() # Mapping of existing instances under group item @@ -659,7 +659,7 @@ class InstanceListView(AbstractInstanceView): for instance_id in to_remove: idx_to_remove.append(existing_mapping[instance_id]) - # Remove them in reverse order to prevend row index changes + # Remove them in reverse order to prevent row index changes for idx in reversed(sorted(idx_to_remove)): group_item.removeRows(idx, 1) diff --git a/openpype/tools/publisher/widgets/validations_widget.py b/openpype/tools/publisher/widgets/validations_widget.py index 09e56d64cc..28b3c3f95d 100644 --- a/openpype/tools/publisher/widgets/validations_widget.py +++ b/openpype/tools/publisher/widgets/validations_widget.py @@ -276,7 +276,7 @@ class VerticallScrollArea(QtWidgets.QScrollArea): The biggest difference is that the scroll area has scroll bar on left side and resize of content will also resize scrollarea itself. - Resize if deffered by 100ms because at the moment of resize are not yet + Resize if deferred by 100ms because at the moment of resize are not yet propagated sizes and visibility of scroll bars. """ def __init__(self, *args, **kwargs): diff --git a/openpype/tools/publisher/widgets/widgets.py b/openpype/tools/publisher/widgets/widgets.py index 2ebcf73d4e..a85fea9cbc 100644 --- a/openpype/tools/publisher/widgets/widgets.py +++ b/openpype/tools/publisher/widgets/widgets.py @@ -749,7 +749,7 @@ class TasksCombobox(QtWidgets.QComboBox): self.value_changed.emit() def set_text(self, text): - """Set context shown in combobox without chaning selected items.""" + """Set context shown in combobox without changing selected items.""" if text == self._text: return @@ -1000,7 +1000,7 @@ class VariantInputWidget(PlaceholderLineEdit): self.value_changed.emit() def reset_to_origin(self): - """Set origin value of selected instnaces.""" + """Set origin value of selected instances.""" self.set_value(self._origin_value) def get_value(self): @@ -1105,7 +1105,7 @@ class GlobalAttrsWidget(QtWidgets.QWidget): Subset name is or may be affected on context. Gives abiity to modify context and subset name of instance. This change is not autopromoted but - must be submited. + must be submitted. Warning: Until artist hit `Submit` changes must not be propagated to instance data. @@ -1179,7 +1179,7 @@ class GlobalAttrsWidget(QtWidgets.QWidget): self.cancel_btn = cancel_btn def _on_submit(self): - """Commit changes for selected instnaces.""" + """Commit changes for selected instances.""" variant_value = None asset_name = None task_name = None @@ -1363,7 +1363,7 @@ class CreatorAttrsWidget(QtWidgets.QWidget): self._attr_def_id_to_instances = {} self._attr_def_id_to_attr_def = {} - # To store content of scroll area to prevend garbage collection + # To store content of scroll area to prevent garbage collection self._content_widget = None def set_instances_valid(self, valid): @@ -1375,7 +1375,7 @@ class CreatorAttrsWidget(QtWidgets.QWidget): self._content_widget.setEnabled(valid) def set_current_instances(self, instances): - """Set current instances for which are attribute definitons shown.""" + """Set current instances for which are attribute definitions shown.""" prev_content_widget = self._scroll_area.widget() if prev_content_widget: self._scroll_area.takeWidget() @@ -1461,7 +1461,7 @@ class PublishPluginAttrsWidget(QtWidgets.QWidget): self._attr_def_id_to_attr_def = {} self._attr_def_id_to_plugin_name = {} - # Store content of scroll area to prevend garbage collection + # Store content of scroll area to prevent garbage collection self._content_widget = None def set_instances_valid(self, valid): @@ -1473,7 +1473,7 @@ class PublishPluginAttrsWidget(QtWidgets.QWidget): self._content_widget.setEnabled(valid) def set_current_instances(self, instances, context_selected): - """Set current instances for which are attribute definitons shown.""" + """Set current instances for which are attribute definitions shown.""" prev_content_widget = self._scroll_area.widget() if prev_content_widget: self._scroll_area.takeWidget() diff --git a/openpype/tools/pyblish_pype/control.py b/openpype/tools/pyblish_pype/control.py index d2b74e316a..64a7f193b4 100644 --- a/openpype/tools/pyblish_pype/control.py +++ b/openpype/tools/pyblish_pype/control.py @@ -106,14 +106,14 @@ class Controller(QtCore.QObject): # ??? Emitted for each process was_processed = QtCore.Signal(dict) - # Emmited when reset + # Emitted when reset # - all data are reset (plugins, processing, pari yielder, etc.) was_reset = QtCore.Signal() - # Emmited when previous group changed + # Emitted when previous group changed passed_group = QtCore.Signal(object) - # Emmited when want to change state of instances + # Emitted when want to change state of instances switch_toggleability = QtCore.Signal(bool) # On action finished @@ -322,7 +322,7 @@ class Controller(QtCore.QObject): try: result = pyblish.plugin.process(plugin, self.context, instance) # Make note of the order at which the - # potential error error occured. + # potential error error occurred. if result["error"] is not None: self.processing["ordersWithError"].add(plugin.order) @@ -564,7 +564,7 @@ class Controller(QtCore.QObject): case must be taken to ensure there are no memory leaks. Explicitly deleting objects shines a light on where objects may still be referenced in the form of an error. No errors - means this was uneccesary, but that's ok. + means this was unnecessary, but that's ok. """ for instance in self.context: diff --git a/openpype/tools/pyblish_pype/util.py b/openpype/tools/pyblish_pype/util.py index 0d581f17af..d3d76b187c 100644 --- a/openpype/tools/pyblish_pype/util.py +++ b/openpype/tools/pyblish_pype/util.py @@ -218,7 +218,7 @@ class OrderGroups: def sort_groups(_groups_dict): sorted_dict = collections.OrderedDict() - # make sure wont affect any dictionary as pointer + # make sure won't affect any dictionary as pointer groups_dict = copy.deepcopy(_groups_dict) last_order = None if None in groups_dict: diff --git a/openpype/tools/sceneinventory/window.py b/openpype/tools/sceneinventory/window.py index e71af6a93d..e363a99d07 100644 --- a/openpype/tools/sceneinventory/window.py +++ b/openpype/tools/sceneinventory/window.py @@ -125,7 +125,7 @@ class SceneInventoryWindow(QtWidgets.QDialog): Override keyPressEvent to do nothing so that Maya's panels won't take focus when pressing "SHIFT" whilst mouse is over viewport or - outliner. This way users don't accidently perform Maya commands + outliner. This way users don't accidentally perform Maya commands whilst trying to name an instance. """ diff --git a/openpype/tools/settings/local_settings/constants.py b/openpype/tools/settings/local_settings/constants.py index 7a8774467f..1836c579af 100644 --- a/openpype/tools/settings/local_settings/constants.py +++ b/openpype/tools/settings/local_settings/constants.py @@ -5,7 +5,7 @@ LABEL_REMOVE_PROJECT = "Remove from project" LABEL_ADD_PROJECT = "Add to project" LABEL_DISCARD_CHANGES = "Discard changes" -# Local setting contants +# Local setting constants # TODO move to settings constants LOCAL_GENERAL_KEY = "general" LOCAL_PROJECTS_KEY = "projects" diff --git a/openpype/tools/settings/local_settings/window.py b/openpype/tools/settings/local_settings/window.py index a00bc232f4..3fbf841ce7 100644 --- a/openpype/tools/settings/local_settings/window.py +++ b/openpype/tools/settings/local_settings/window.py @@ -222,7 +222,7 @@ class LocalSettingsWindow(QtWidgets.QWidget): # Do not create local settings widget in init phase as it's using # settings objects that must be OK to be able create this widget # - we want to show dialog if anything goes wrong - # - without reseting nothing is shown + # - without resetting nothing is shown self._settings_widget = None self._scroll_widget = scroll_widget self.reset_btn = reset_btn diff --git a/openpype/tools/settings/settings/README.md b/openpype/tools/settings/settings/README.md index 31d8fc5b74..1c916ddff2 100644 --- a/openpype/tools/settings/settings/README.md +++ b/openpype/tools/settings/settings/README.md @@ -10,7 +10,7 @@ - `"is_file"` - this key is for storing openpype defaults in `openpype` repo - reasons of existence: developing new schemas does not require to create defaults manually - key is validated, must be once in hierarchy else it won't be possible to store openpype defaults - - `"is_group"` - define that all values under key in hierarchy will be overriden if any value is modified, this information is also stored to overrides + - `"is_group"` - define that all values under key in hierarchy will be overridden if any value is modified, this information is also stored to overrides - this keys is not allowed for all inputs as they may have not reason for that - key is validated, can be only once in hierarchy but is not required - currently there are `system configurations` and `project configurations` @@ -199,7 +199,7 @@ - number input, can be used for both integer and float - key `"decimal"` defines how many decimal places will be used, 0 is for integer input (Default: `0`) - key `"minimum"` as minimum allowed number to enter (Default: `-99999`) - - key `"maxium"` as maximum allowed number to enter (Default: `99999`) + - key `"maximum"` as maximum allowed number to enter (Default: `99999`) ``` { "type": "number", diff --git a/openpype/tools/settings/settings/base.py b/openpype/tools/settings/settings/base.py index 6a8d123617..3a173e85de 100644 --- a/openpype/tools/settings/settings/base.py +++ b/openpype/tools/settings/settings/base.py @@ -289,7 +289,7 @@ class BaseWidget(QtWidgets.QWidget): action = QtWidgets.QAction("Paste", menu) output.append((action, paste_value)) - # Paste value to matchin entity + # Paste value to matching entity def paste_value_to_path(): with self.category_widget.working_state_context(): _set_entity_value(matching_entity, value) diff --git a/openpype/tools/settings/settings/item_widgets.py b/openpype/tools/settings/settings/item_widgets.py index 22f672da2b..161b8ca67e 100644 --- a/openpype/tools/settings/settings/item_widgets.py +++ b/openpype/tools/settings/settings/item_widgets.py @@ -477,7 +477,7 @@ class OpenPypeVersionText(TextWidget): self.entity.set(value) self.update_style() else: - # Manually trigger hierachical style update + # Manually trigger hierarchical style update self.ignore_input_changes.set_ignore(True) self.ignore_input_changes.set_ignore(False) @@ -675,7 +675,7 @@ class RawJsonWidget(InputWidget): self.entity.set(self.input_field.json_value()) self.update_style() else: - # Manually trigger hierachical style update + # Manually trigger hierarchical style update self.ignore_input_changes.set_ignore(True) self.ignore_input_changes.set_ignore(False) @@ -792,7 +792,7 @@ class PathWidget(BaseWidget): self.input_field.hierarchical_style_update() def _on_entity_change(self): - # No need to do anything. Styles will be updated from top hierachy. + # No need to do anything. Styles will be updated from top hierarchy. pass def update_style(self): diff --git a/openpype/tools/settings/settings/lib.py b/openpype/tools/settings/settings/lib.py index d12a14259a..eef157812f 100644 --- a/openpype/tools/settings/settings/lib.py +++ b/openpype/tools/settings/settings/lib.py @@ -7,7 +7,7 @@ VALUE_CHANGE_OFFSET_MS = 300 def create_deffered_value_change_timer(callback): - """Deffer value change callback. + """Defer value change callback. UI won't trigger all callbacks on each value change but after predefined time. Timer is reset on each start so callback is triggered after user diff --git a/openpype/tools/settings/settings/list_strict_widget.py b/openpype/tools/settings/settings/list_strict_widget.py index 046b6992f6..f0a3022a50 100644 --- a/openpype/tools/settings/settings/list_strict_widget.py +++ b/openpype/tools/settings/settings/list_strict_widget.py @@ -28,7 +28,7 @@ class ListStrictWidget(BaseWidget): break self._any_children_has_label = any_children_has_label - # Change column stretch factor for verticall alignment + # Change column stretch factor for vertical alignment if not self.entity.is_horizontal: col_index = 2 if any_children_has_label else 1 content_layout.setColumnStretch(col_index, 1) diff --git a/openpype/tools/settings/settings/multiselection_combobox.py b/openpype/tools/settings/settings/multiselection_combobox.py index 176f4cab8c..c2cc2a8fee 100644 --- a/openpype/tools/settings/settings/multiselection_combobox.py +++ b/openpype/tools/settings/settings/multiselection_combobox.py @@ -131,7 +131,7 @@ class MultiSelectionComboBox(QtWidgets.QComboBox): elif event.type() == QtCore.QEvent.KeyPress: # TODO: handle QtCore.Qt.Key_Enter, Key_Return? if event.key() == QtCore.Qt.Key_Space: - # toogle the current items check state + # toggle the current items check state if ( index_flags & QtCore.Qt.ItemIsUserCheckable and index_flags & QtCore.Qt.ItemIsTristate diff --git a/openpype/tools/settings/settings/window.py b/openpype/tools/settings/settings/window.py index c376e5e91e..411e7b5e7f 100644 --- a/openpype/tools/settings/settings/window.py +++ b/openpype/tools/settings/settings/window.py @@ -153,7 +153,7 @@ class MainWidget(QtWidgets.QWidget): def _on_restart_required(self): # Don't show dialog if there are not registered slots for # `trigger_restart` signal. - # - For example when settings are runnin as standalone tool + # - For example when settings are running as standalone tool # - PySide2 and PyQt5 compatible way how to find out method_index = self.metaObject().indexOfMethod("trigger_restart()") method = self.metaObject().method(method_index) diff --git a/openpype/tools/standalonepublish/app.py b/openpype/tools/standalonepublish/app.py index 2ce757f773..3630d92c83 100644 --- a/openpype/tools/standalonepublish/app.py +++ b/openpype/tools/standalonepublish/app.py @@ -99,7 +99,7 @@ class Window(QtWidgets.QDialog): return self._db def on_start(self): - ''' Things must be done when initilized. + ''' Things must be done when initialized. ''' # Refresh asset input in Family widget self.on_asset_changed() diff --git a/openpype/tools/standalonepublish/widgets/model_asset.py b/openpype/tools/standalonepublish/widgets/model_asset.py index 44649b3dc3..60afe8f96c 100644 --- a/openpype/tools/standalonepublish/widgets/model_asset.py +++ b/openpype/tools/standalonepublish/widgets/model_asset.py @@ -68,7 +68,7 @@ class AssetModel(TreeModel): """ if silos: # WARNING: Silo item "_id" is set to silo value - # mainly because GUI issue with perserve selection and expanded row + # mainly because GUI issue with preserve selection and expanded row # and because of easier hierarchy parenting (in "assets") for silo in silos: node = Node({ diff --git a/openpype/tools/standalonepublish/widgets/widget_asset.py b/openpype/tools/standalonepublish/widgets/widget_asset.py index f4a4dfe0c4..2886d600bf 100644 --- a/openpype/tools/standalonepublish/widgets/widget_asset.py +++ b/openpype/tools/standalonepublish/widgets/widget_asset.py @@ -18,7 +18,7 @@ def preserve_expanded_rows(tree_view, This function is created to maintain the expand vs collapse status of the model items. When refresh is triggered the items which are expanded - will stay expanded and vise versa. + will stay expanded and vice versa. Arguments: tree_view (QWidgets.QTreeView): the tree view which is @@ -68,7 +68,7 @@ def preserve_selection(tree_view, This function is created to maintain the selection status of the model items. When refresh is triggered the items which are expanded - will stay expanded and vise versa. + will stay expanded and vice versa. tree_view (QWidgets.QTreeView): the tree view nested in the application column (int): the column to retrieve the data from @@ -390,7 +390,7 @@ class AssetWidget(QtWidgets.QWidget): assets, (tuple, list) ), "Assets must be list or tuple" - # convert to list - tuple cant be modified + # convert to list - tuple can't be modified assets = list(assets) # Clear selection diff --git a/openpype/tools/standalonepublish/widgets/widget_drop_frame.py b/openpype/tools/standalonepublish/widgets/widget_drop_frame.py index 7fe43c4203..c1c59d65b6 100644 --- a/openpype/tools/standalonepublish/widgets/widget_drop_frame.py +++ b/openpype/tools/standalonepublish/widgets/widget_drop_frame.py @@ -101,7 +101,7 @@ class DropDataFrame(QtWidgets.QFrame): return paths def _add_item(self, data, actions=[]): - # Assign to self so garbage collector wont remove the component + # Assign to self so garbage collector won't remove the component # during initialization new_component = ComponentItem(self.components_list, self) new_component.set_context(data) diff --git a/openpype/tools/standalonepublish/widgets/widget_family.py b/openpype/tools/standalonepublish/widgets/widget_family.py index 1e20028392..ae44899a89 100644 --- a/openpype/tools/standalonepublish/widgets/widget_family.py +++ b/openpype/tools/standalonepublish/widgets/widget_family.py @@ -373,7 +373,7 @@ class FamilyWidget(QtWidgets.QWidget): Override keyPressEvent to do nothing so that Maya's panels won't take focus when pressing "SHIFT" whilst mouse is over viewport or - outliner. This way users don't accidently perform Maya commands + outliner. This way users don't accidentally perform Maya commands whilst trying to name an instance. """ diff --git a/openpype/tools/tray/pype_info_widget.py b/openpype/tools/tray/pype_info_widget.py index e68793b18c..8414cefec8 100644 --- a/openpype/tools/tray/pype_info_widget.py +++ b/openpype/tools/tray/pype_info_widget.py @@ -433,7 +433,7 @@ class PypeInfoSubWidget(QtWidgets.QWidget): pype_info.pop("version_type", self.not_applicable) ) pype_info["version_value"] = version_value - # Prepare lable mapping + # Prepare label mapping key_label_mapping = { "version_value": "Running version:", "build_verison": "Build version:", diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py index 99d431172a..9d4d0aa31b 100644 --- a/openpype/tools/tray/pype_tray.py +++ b/openpype/tools/tray/pype_tray.py @@ -238,7 +238,7 @@ class TrayManager: @property def doubleclick_callback(self): - """Doubleclick callback for Tray icon.""" + """Double-click callback for Tray icon.""" callback_name = self.modules_manager.doubleclick_callback return self.modules_manager.doubleclick_callbacks.get(callback_name) @@ -398,7 +398,7 @@ class TrayManager: title = "Settings miss default values" msg = ( "Your OpenPype will not work as expected! \n" - "Some default values in settigs are missing. \n\n" + "Some default values in settings are missing. \n\n" "Please contact OpenPype team." ) msg_box = QtWidgets.QMessageBox( @@ -430,7 +430,7 @@ class TrayManager: message (str): Content of message. icon (QSystemTrayIcon.MessageIcon): Message's icon. Default is Information icon, may differ by Qt version. - msecs (int): Duration of message visibility in miliseconds. + msecs (int): Duration of message visibility in milliseconds. Default is 10000 msecs, may differ by Qt version. """ args = [title, message] diff --git a/openpype/tools/tray_app/app.py b/openpype/tools/tray_app/app.py index f1363d0cab..0005c6fb94 100644 --- a/openpype/tools/tray_app/app.py +++ b/openpype/tools/tray_app/app.py @@ -268,7 +268,7 @@ class ConsoleTrayApp: def _multiple_replace(text, adict): """Replace multiple tokens defined in dict. - Find and replace all occurances of strings defined in dict is + Find and replace all occurrences of strings defined in dict is supplied string. Args: diff --git a/openpype/tools/utils/host_tools.py b/openpype/tools/utils/host_tools.py index 60c9e79829..a7ad8fef3b 100644 --- a/openpype/tools/utils/host_tools.py +++ b/openpype/tools/utils/host_tools.py @@ -1,6 +1,6 @@ """Single access point to all tools usable in hosts. -It is possible to create `HostToolsHelper` in host implementaion or +It is possible to create `HostToolsHelper` in host implementation or use singleton approach with global functions (using helper anyway). """ @@ -223,7 +223,7 @@ class HostToolsHelper: """Dialog of experimental tools. For some hosts it is not easy to modify menu of tools. For - those cases was addded experimental tools dialog which is Qt based + those cases was added experimental tools dialog which is Qt based and can dynamically filled by experimental tools so host need only single "Experimental tools" button to see them. @@ -347,7 +347,7 @@ class _SingletonPoint: return cls.helper.get_tool_by_name(tool_name, parent, *args, **kwargs) -# Function callbacks using singleton acces point +# Function callbacks using singleton access point def get_tool_by_name(tool_name, parent=None, *args, **kwargs): return _SingletonPoint.get_tool_by_name(tool_name, parent, *args, **kwargs) diff --git a/openpype/tools/utils/lib.py b/openpype/tools/utils/lib.py index caaad522ad..84156fce0d 100644 --- a/openpype/tools/utils/lib.py +++ b/openpype/tools/utils/lib.py @@ -132,7 +132,7 @@ def preserve_expanded_rows(tree_view, column=0, role=None): This function is created to maintain the expand vs collapse status of the model items. When refresh is triggered the items which are expanded - will stay expanded and vise versa. + will stay expanded and vice versa. Arguments: tree_view (QWidgets.QTreeView): the tree view which is @@ -176,7 +176,7 @@ def preserve_selection(tree_view, column=0, role=None, current_index=True): This function is created to maintain the selection status of the model items. When refresh is triggered the items which are expanded - will stay expanded and vise versa. + will stay expanded and vice versa. tree_view (QWidgets.QTreeView): the tree view nested in the application column (int): the column to retrieve the data from @@ -372,7 +372,7 @@ class GroupsConfig: group_configs = [] project_name = self.dbcon.Session.get("AVALON_PROJECT") if project_name: - # Get pre-defined group name and apperance from project config + # Get pre-defined group name and appearance from project config project_doc = self.dbcon.find_one( {"type": "project"}, projection={"config.groups": True} diff --git a/openpype/tools/utils/widgets.py b/openpype/tools/utils/widgets.py index c32eae043e..e82bced927 100644 --- a/openpype/tools/utils/widgets.py +++ b/openpype/tools/utils/widgets.py @@ -152,7 +152,7 @@ class OptionalMenu(QtWidgets.QMenu): """A subclass of `QtWidgets.QMenu` to work with `OptionalAction` This menu has reimplemented `mouseReleaseEvent`, `mouseMoveEvent` and - `leaveEvent` to provide better action hightlighting and triggering for + `leaveEvent` to provide better action highlighting and triggering for actions that were instances of `QtWidgets.QWidgetAction`. """ diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py index f4a86050cb..3167a082de 100644 --- a/openpype/tools/workfiles/app.py +++ b/openpype/tools/workfiles/app.py @@ -162,7 +162,7 @@ class NameWindow(QtWidgets.QDialog): # Build inputs inputs_layout = QtWidgets.QFormLayout(inputs_widget) - # Add version only if template contain version key + # Add version only if template contains version key # - since the version can be padded with "{version:0>4}" we only search # for "{version". if "{version" in self.template: @@ -170,7 +170,7 @@ class NameWindow(QtWidgets.QDialog): else: version_widget.setVisible(False) - # Add subversion only if template containt `{comment}` + # Add subversion only if template contains `{comment}` if "{comment}" in self.template: inputs_layout.addRow("Subversion:", subversion_input) else: @@ -183,7 +183,7 @@ class NameWindow(QtWidgets.QDialog): main_layout.addWidget(inputs_widget) main_layout.addWidget(btns_widget) - # Singal callback registration + # Signal callback registration version_input.valueChanged.connect(self.on_version_spinbox_changed) last_version_check.stateChanged.connect( self.on_version_checkbox_changed @@ -833,7 +833,7 @@ class SidePanelWidget(QtWidgets.QWidget): self.note_input.setEnabled(enabled) self.btn_note_save.setEnabled(enabled) - # Make sure workfile doc is overriden + # Make sure workfile doc is overridden self._workfile_doc = workfile_doc # Disable inputs and remove texts if any required arguments are missing if not enabled: @@ -978,7 +978,7 @@ class Window(QtWidgets.QMainWindow): Override keyPressEvent to do nothing so that Maya's panels won't take focus when pressing "SHIFT" whilst mouse is over viewport or - outliner. This way users don't accidently perform Maya commands + outliner. This way users don't accidentally perform Maya commands whilst trying to name an instance. """ From dab508c7ca1ae425e13ab7543cd5028e836b2553 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sun, 30 Jan 2022 22:17:17 +0100 Subject: [PATCH 113/123] Fix type name for 'representation' --- openpype/tools/sceneinventory/switch_dialog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/tools/sceneinventory/switch_dialog.py b/openpype/tools/sceneinventory/switch_dialog.py index 75e2b6be40..4946c073d4 100644 --- a/openpype/tools/sceneinventory/switch_dialog.py +++ b/openpype/tools/sceneinventory/switch_dialog.py @@ -558,7 +558,7 @@ class SwitchAssetDialog(QtWidgets.QDialog): repre_docs = io.find( { - "type": "rerpesentation", + "type": "representation", "parent": subset_doc["_id"], "name": {"$in": list(repre_names)} }, From f9209be51939a47c19d62600f5604780047acdb2 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Sun, 30 Jan 2022 23:05:17 +0100 Subject: [PATCH 114/123] Refactor `overriden` -> `overridden` + `hightlight` -> `highlight` --- .../publish/extract_subset_resources.py | 2 +- .../ftrack/ftrack_server/lib.py | 2 +- .../sync_server/providers/dropbox.py | 2 +- .../sync_server/providers/gdrive.py | 6 ++--- .../sync_server/providers/sftp.py | 4 ++-- .../sync_server/sync_server_module.py | 2 +- openpype/modules/interfaces.py | 2 +- .../job_queue/job_server/workers_rpc_route.py | 2 +- openpype/pipeline/publish/lib.py | 2 +- openpype/scripts/otio_burnin.py | 4 ++-- openpype/settings/constants.py | 6 ++--- openpype/settings/entities/base_entity.py | 4 ++-- .../settings/entities/dict_conditional.py | 14 +++++------ .../entities/dict_immutable_keys_entity.py | 14 +++++------ .../entities/dict_mutable_keys_entity.py | 2 +- openpype/settings/entities/lib.py | 2 +- openpype/settings/entities/schemas/README.md | 4 ++-- .../schemas/system_schema/example_schema.json | 8 +++---- openpype/settings/handlers.py | 20 ++++++++-------- openpype/settings/lib.py | 14 +++++------ openpype/style/data.json | 2 +- openpype/style/style.css | 24 +++++++++---------- openpype/tests/test_avalon_plugin_presets.py | 4 ++-- .../local_settings/projects_widget.py | 4 ++-- openpype/tools/settings/settings/README.md | 2 +- openpype/tools/settings/settings/base.py | 2 +- .../settings/settings/dict_conditional.py | 2 +- .../settings/settings/dict_mutable_widget.py | 6 ++--- .../tools/settings/settings/item_widgets.py | 2 +- openpype/tools/utils/widgets.py | 2 +- openpype/tools/workfiles/app.py | 2 +- 31 files changed, 84 insertions(+), 84 deletions(-) diff --git a/openpype/hosts/flame/plugins/publish/extract_subset_resources.py b/openpype/hosts/flame/plugins/publish/extract_subset_resources.py index 291e440cbe..d1222f2492 100644 --- a/openpype/hosts/flame/plugins/publish/extract_subset_resources.py +++ b/openpype/hosts/flame/plugins/publish/extract_subset_resources.py @@ -71,7 +71,7 @@ class ExtractSubsetResources(openpype.api.Extractor): staging_dir = self.staging_dir(instance) # add default preset type for thumbnail and reviewable video - # update them with settings and overide in case the same + # update them with settings and override in case the same # are found in there export_presets = deepcopy(self.default_presets) export_presets.update(self.export_presets_mapping) diff --git a/openpype/modules/default_modules/ftrack/ftrack_server/lib.py b/openpype/modules/default_modules/ftrack/ftrack_server/lib.py index e80d6a3a6b..f8319b67d4 100644 --- a/openpype/modules/default_modules/ftrack/ftrack_server/lib.py +++ b/openpype/modules/default_modules/ftrack/ftrack_server/lib.py @@ -164,7 +164,7 @@ class ProcessEventHub(SocketBaseEventHub): sys.exit(0) def wait(self, duration=None): - """Overriden wait + """Overridden wait Event are loaded from Mongo DB when queue is empty. Handled event is set as processed in Mongo DB. """ diff --git a/openpype/modules/default_modules/sync_server/providers/dropbox.py b/openpype/modules/default_modules/sync_server/providers/dropbox.py index 90d7d44bb8..6200b12bb2 100644 --- a/openpype/modules/default_modules/sync_server/providers/dropbox.py +++ b/openpype/modules/default_modules/sync_server/providers/dropbox.py @@ -95,7 +95,7 @@ class DropboxHandler(AbstractProvider): "key": "acting_as_member", "label": "Acting As Member" }, - # roots could be overriden only on Project level, User cannot + # roots could be overridden only on Project level, User cannot { "key": "root", "label": "Roots", diff --git a/openpype/modules/default_modules/sync_server/providers/gdrive.py b/openpype/modules/default_modules/sync_server/providers/gdrive.py index d43e2b3d61..0b586613b5 100644 --- a/openpype/modules/default_modules/sync_server/providers/gdrive.py +++ b/openpype/modules/default_modules/sync_server/providers/gdrive.py @@ -119,7 +119,7 @@ class GDriveHandler(AbstractProvider): # {platform} tells that value is multiplatform and only specific OS # should be returned editable = [ - # credentials could be overriden on Project or User level + # credentials could be overridden on Project or User level { "type": "path", "key": "credentials_url", @@ -127,7 +127,7 @@ class GDriveHandler(AbstractProvider): "multiplatform": True, "placeholder": "Credentials url" }, - # roots could be overriden only on Project leve, User cannot + # roots could be overridden only on Project level, User cannot { "key": "root", "label": "Roots", @@ -414,7 +414,7 @@ class GDriveHandler(AbstractProvider): def delete_folder(self, path, force=False): """ Deletes folder on GDrive. Checks if folder contains any files or - subfolders. In that case raises error, could be overriden by + subfolders. In that case raises error, could be overridden by 'force' argument. In that case deletes folder on 'path' and all its children. diff --git a/openpype/modules/default_modules/sync_server/providers/sftp.py b/openpype/modules/default_modules/sync_server/providers/sftp.py index 1585b326bd..49b87b14ec 100644 --- a/openpype/modules/default_modules/sync_server/providers/sftp.py +++ b/openpype/modules/default_modules/sync_server/providers/sftp.py @@ -97,7 +97,7 @@ class SFTPHandler(AbstractProvider): # {platform} tells that value is multiplatform and only specific OS # should be returned editable = [ - # credentials could be overriden on Project or User level + # credentials could be overridden on Project or User level { 'key': "sftp_host", 'label': "SFTP host name", @@ -129,7 +129,7 @@ class SFTPHandler(AbstractProvider): 'label': "SFTP user ssh key password", 'type': 'text' }, - # roots could be overriden only on Project leve, User cannot + # roots could be overridden only on Project level, User cannot { "key": "root", "label": "Roots", diff --git a/openpype/modules/default_modules/sync_server/sync_server_module.py b/openpype/modules/default_modules/sync_server/sync_server_module.py index 500203f3fc..caf58503f1 100644 --- a/openpype/modules/default_modules/sync_server/sync_server_module.py +++ b/openpype/modules/default_modules/sync_server/sync_server_module.py @@ -1073,7 +1073,7 @@ class SyncServerModule(OpenPypeModule, ITrayModule): """ Returns settings for 'studio' and user's local site - Returns base values from setting, not overriden by Local Settings, + Returns base values from setting, not overridden by Local Settings, eg. value used to push TO LS not to get actual value for syncing. """ if not project_name: diff --git a/openpype/modules/interfaces.py b/openpype/modules/interfaces.py index e6e84a0d42..7c301c15b4 100644 --- a/openpype/modules/interfaces.py +++ b/openpype/modules/interfaces.py @@ -115,7 +115,7 @@ class ITrayAction(ITrayModule): Add action to tray menu which will trigger `on_action_trigger`. It is expected to be used for showing tools. - Methods `tray_start`, `tray_exit` and `connect_with_modules` are overriden + Methods `tray_start`, `tray_exit` and `connect_with_modules` are overridden as it's not expected that action will use them. But it is possible if necessary. """ diff --git a/openpype/modules/job_queue/job_server/workers_rpc_route.py b/openpype/modules/job_queue/job_server/workers_rpc_route.py index 0800ca0d4d..e3c67fb3c3 100644 --- a/openpype/modules/job_queue/job_server/workers_rpc_route.py +++ b/openpype/modules/job_queue/job_server/workers_rpc_route.py @@ -72,7 +72,7 @@ class WorkerRpc(JsonRpc): self._job_queue.remove_worker(worker) async def handle_websocket_request(self, http_request): - """Overide this method to catch CLOSING messages.""" + """Override this method to catch CLOSING messages.""" http_request.msg_id = 0 http_request.pending = {} diff --git a/openpype/pipeline/publish/lib.py b/openpype/pipeline/publish/lib.py index 0fa712a301..d3e4ec8a02 100644 --- a/openpype/pipeline/publish/lib.py +++ b/openpype/pipeline/publish/lib.py @@ -31,7 +31,7 @@ class DiscoverResult: def publish_plugins_discover(paths=None): """Find and return available pyblish plug-ins - Overriden function from `pyblish` module to be able collect crashed files + Overridden function from `pyblish` module to be able collect crashed files and reason of their crash. Arguments: diff --git a/openpype/scripts/otio_burnin.py b/openpype/scripts/otio_burnin.py index 639657d68f..abf69645b7 100644 --- a/openpype/scripts/otio_burnin.py +++ b/openpype/scripts/otio_burnin.py @@ -252,7 +252,7 @@ class ModifiedBurnins(ffmpeg_burnins.Burnins): - required IF start frame is not set when using frames or timecode burnins On initializing class can be set General options through "options_init" arg. - General can be overriden when adding burnin + General can be overridden when adding burnin ''' TOP_CENTERED = ffmpeg_burnins.TOP_CENTERED @@ -549,7 +549,7 @@ def burnins_from_data( codec_data (list): All codec related arguments in list. options (dict): Options for burnins. burnin_values (dict): Contain positioned values. - overwrite (bool): Output will be overriden if already exists, + overwrite (bool): Output will be overwritten if already exists, True by default. Presets must be set separately. Should be dict with 2 keys: diff --git a/openpype/settings/constants.py b/openpype/settings/constants.py index 2ea19ead4b..9fd0d5b417 100644 --- a/openpype/settings/constants.py +++ b/openpype/settings/constants.py @@ -2,14 +2,14 @@ import re # Metadata keys for work with studio and project overrides -M_OVERRIDEN_KEY = "__overriden_keys__" +M_OVERRIDDEN_KEY = "__overridden_keys__" # Metadata key for storing information about environments M_ENVIRONMENT_KEY = "__environment_keys__" # Metadata key for storing dynamic created labels M_DYNAMIC_KEY_LABEL = "__dynamic_keys_labels__" METADATA_KEYS = ( - M_OVERRIDEN_KEY, + M_OVERRIDDEN_KEY, M_ENVIRONMENT_KEY, M_DYNAMIC_KEY_LABEL ) @@ -32,7 +32,7 @@ KEY_REGEX = re.compile(r"^[{}]+$".format(KEY_ALLOWED_SYMBOLS)) __all__ = ( - "M_OVERRIDEN_KEY", + "M_OVERRIDDEN_KEY", "M_ENVIRONMENT_KEY", "M_DYNAMIC_KEY_LABEL", diff --git a/openpype/settings/entities/base_entity.py b/openpype/settings/entities/base_entity.py index 582937481a..b5bc44640b 100644 --- a/openpype/settings/entities/base_entity.py +++ b/openpype/settings/entities/base_entity.py @@ -752,7 +752,7 @@ class BaseItemEntity(BaseEntity): @abstractmethod def _add_to_project_override(self, on_change_trigger): - """Item's implementation to set values as overriden for project. + """Item's implementation to set values as overridden for project. Mark item and all it's children to be stored as project overrides. """ @@ -794,7 +794,7 @@ class BaseItemEntity(BaseEntity): """Item's implementation to remove project overrides. Mark item as does not have project overrides. Must not change - `was_overriden` attribute value. + `was_overridden` attribute value. Args: on_change_trigger (list): Callbacks of `on_change` should be stored diff --git a/openpype/settings/entities/dict_conditional.py b/openpype/settings/entities/dict_conditional.py index 92512a6668..963fd406ed 100644 --- a/openpype/settings/entities/dict_conditional.py +++ b/openpype/settings/entities/dict_conditional.py @@ -6,7 +6,7 @@ from .lib import ( ) from openpype.settings.constants import ( METADATA_KEYS, - M_OVERRIDEN_KEY, + M_OVERRIDDEN_KEY, KEY_REGEX ) from . import ( @@ -119,7 +119,7 @@ class DictConditionalEntity(ItemEntity): # `current_metadata` are still when schema is loaded # - only metadata stored with dict item are gorup overrides in - # M_OVERRIDEN_KEY + # M_OVERRIDDEN_KEY self._current_metadata = {} self._metadata_are_modified = False @@ -377,9 +377,9 @@ class DictConditionalEntity(ItemEntity): ): continue - if M_OVERRIDEN_KEY not in current_metadata: - current_metadata[M_OVERRIDEN_KEY] = [] - current_metadata[M_OVERRIDEN_KEY].append(key) + if M_OVERRIDDEN_KEY not in current_metadata: + current_metadata[M_OVERRIDDEN_KEY] = [] + current_metadata[M_OVERRIDDEN_KEY].append(key) # Define if current metadata are avaialble for current override state metadata = NOT_SET @@ -535,7 +535,7 @@ class DictConditionalEntity(ItemEntity): enum_value = value.get(self.enum_key) - old_metadata = metadata.get(M_OVERRIDEN_KEY) + old_metadata = metadata.get(M_OVERRIDDEN_KEY) if old_metadata: old_metadata_set = set(old_metadata) new_metadata = [] @@ -547,7 +547,7 @@ class DictConditionalEntity(ItemEntity): for key in old_metadata_set: new_metadata.append(key) - metadata[M_OVERRIDEN_KEY] = new_metadata + metadata[M_OVERRIDDEN_KEY] = new_metadata return value, metadata diff --git a/openpype/settings/entities/dict_immutable_keys_entity.py b/openpype/settings/entities/dict_immutable_keys_entity.py index c477a0eb0f..060f8d522e 100644 --- a/openpype/settings/entities/dict_immutable_keys_entity.py +++ b/openpype/settings/entities/dict_immutable_keys_entity.py @@ -9,7 +9,7 @@ from .lib import ( ) from openpype.settings.constants import ( METADATA_KEYS, - M_OVERRIDEN_KEY, + M_OVERRIDDEN_KEY, KEY_REGEX ) from . import ( @@ -183,7 +183,7 @@ class DictImmutableKeysEntity(ItemEntity): # `current_metadata` are still when schema is loaded # - only metadata stored with dict item are gorup overrides in - # M_OVERRIDEN_KEY + # M_OVERRIDDEN_KEY self._current_metadata = {} self._metadata_are_modified = False @@ -257,9 +257,9 @@ class DictImmutableKeysEntity(ItemEntity): ): continue - if M_OVERRIDEN_KEY not in current_metadata: - current_metadata[M_OVERRIDEN_KEY] = [] - current_metadata[M_OVERRIDEN_KEY].append(key) + if M_OVERRIDDEN_KEY not in current_metadata: + current_metadata[M_OVERRIDDEN_KEY] = [] + current_metadata[M_OVERRIDDEN_KEY].append(key) # Define if current metadata are avaialble for current override state metadata = NOT_SET @@ -399,7 +399,7 @@ class DictImmutableKeysEntity(ItemEntity): if key in value: metadata[key] = value.pop(key) - old_metadata = metadata.get(M_OVERRIDEN_KEY) + old_metadata = metadata.get(M_OVERRIDDEN_KEY) if old_metadata: old_metadata_set = set(old_metadata) new_metadata = [] @@ -410,7 +410,7 @@ class DictImmutableKeysEntity(ItemEntity): for key in old_metadata_set: new_metadata.append(key) - metadata[M_OVERRIDEN_KEY] = new_metadata + metadata[M_OVERRIDDEN_KEY] = new_metadata return value, metadata diff --git a/openpype/settings/entities/dict_mutable_keys_entity.py b/openpype/settings/entities/dict_mutable_keys_entity.py index 08b0f75649..6b9c0bc7ed 100644 --- a/openpype/settings/entities/dict_mutable_keys_entity.py +++ b/openpype/settings/entities/dict_mutable_keys_entity.py @@ -222,7 +222,7 @@ class DictMutableKeysEntity(EndpointEntity): self.required_keys = self.schema_data.get("required_keys") or [] self.collapsible_key = self.schema_data.get("collapsible_key") or False # GUI attributes - self.hightlight_content = ( + self.highlight_content = ( self.schema_data.get("highlight_content") or False ) diff --git a/openpype/settings/entities/lib.py b/openpype/settings/entities/lib.py index bf3868c08d..1c7dc9bed0 100644 --- a/openpype/settings/entities/lib.py +++ b/openpype/settings/entities/lib.py @@ -101,7 +101,7 @@ class OverrideState: - DEFAULTS - Entity cares only about default values. It is not possible to set higher state if any entity does not have filled default value. - - STUDIO - First layer of overrides. Hold only studio overriden values + - STUDIO - First layer of overrides. Hold only studio overridden values that are applied on top of defaults. - PROJECT - Second layer of overrides. Hold only project overrides that are applied on top of defaults and studio overrides. diff --git a/openpype/settings/entities/schemas/README.md b/openpype/settings/entities/schemas/README.md index 4e8dcc36ce..dd7601c017 100644 --- a/openpype/settings/entities/schemas/README.md +++ b/openpype/settings/entities/schemas/README.md @@ -10,7 +10,7 @@ - `"is_file"` - this key is for storing openpype defaults in `openpype` repo - reasons of existence: developing new schemas does not require to create defaults manually - key is validated, must be once in hierarchy else it won't be possible to store openpype defaults - - `"is_group"` - define that all values under key in hierarchy will be overriden if any value is modified, this information is also stored to overrides + - `"is_group"` - define that all values under key in hierarchy will be overridden if any value is modified, this information is also stored to overrides - this keys is not allowed for all inputs as they may have not reason for that - key is validated, can be only once in hierarchy but is not required - currently there are `system settings` and `project settings` @@ -767,7 +767,7 @@ Anatomy represents data stored on project document. ### anatomy - entity works similarly to `dict` -- anatomy has always all keys overriden with overrides +- anatomy has always all keys overridden with overrides - overrides are not applied as all anatomy data must be available from project document - all children must be groups diff --git a/openpype/settings/entities/schemas/system_schema/example_schema.json b/openpype/settings/entities/schemas/system_schema/example_schema.json index c30e1f6848..6a86dae259 100644 --- a/openpype/settings/entities/schemas/system_schema/example_schema.json +++ b/openpype/settings/entities/schemas/system_schema/example_schema.json @@ -11,13 +11,13 @@ }, { "type": "dict-conditional", - "key": "overriden_value", - "label": "Overriden value", - "enum_key": "overriden", + "key": "overridden_value", + "label": "Overridden value", + "enum_key": "overridden", "enum_is_horizontal": true, "enum_children": [ { - "key": "overriden", + "key": "overridden", "label": "Override value", "children": [ { diff --git a/openpype/settings/handlers.py b/openpype/settings/handlers.py index 51e390bb6d..af05bbf413 100644 --- a/openpype/settings/handlers.py +++ b/openpype/settings/handlers.py @@ -13,7 +13,7 @@ from .constants import ( PROJECT_SETTINGS_KEY, PROJECT_ANATOMY_KEY, LOCAL_SETTING_KEY, - M_OVERRIDEN_KEY + M_OVERRIDDEN_KEY ) from .lib import load_json_file @@ -254,12 +254,12 @@ class MongoSettingsHandler(SettingsHandler): continue # Pop key from values output[key] = general_data.pop(key) - # Pop key from overriden metadata + # Pop key from overridden metadata if ( - M_OVERRIDEN_KEY in general_data - and key in general_data[M_OVERRIDEN_KEY] + M_OVERRIDDEN_KEY in general_data + and key in general_data[M_OVERRIDDEN_KEY] ): - general_data[M_OVERRIDEN_KEY].remove(key) + general_data[M_OVERRIDDEN_KEY].remove(key) return output def _apply_global_settings( @@ -319,17 +319,17 @@ class MongoSettingsHandler(SettingsHandler): system_general = {} system_settings_data["general"] = system_general - overriden_keys = system_general.get(M_OVERRIDEN_KEY) or [] + overridden_keys = system_general.get(M_OVERRIDDEN_KEY) or [] for key in self.global_general_keys: if key not in globals_data: continue system_general[key] = globals_data[key] - if key not in overriden_keys: - overriden_keys.append(key) + if key not in overridden_keys: + overridden_keys.append(key) - if overriden_keys: - system_general[M_OVERRIDEN_KEY] = overriden_keys + if overridden_keys: + system_general[M_OVERRIDDEN_KEY] = overridden_keys return system_settings_document diff --git a/openpype/settings/lib.py b/openpype/settings/lib.py index 43489aecfd..1b5682536a 100644 --- a/openpype/settings/lib.py +++ b/openpype/settings/lib.py @@ -8,7 +8,7 @@ from .exceptions import ( SaveWarningExc ) from .constants import ( - M_OVERRIDEN_KEY, + M_OVERRIDDEN_KEY, M_ENVIRONMENT_KEY, METADATA_KEYS, @@ -546,13 +546,13 @@ def subkey_merge(_dict, value, keys): def merge_overrides(source_dict, override_dict): """Merge data from override_dict to source_dict.""" - if M_OVERRIDEN_KEY in override_dict: - overriden_keys = set(override_dict.pop(M_OVERRIDEN_KEY)) + if M_OVERRIDDEN_KEY in override_dict: + overridden_keys = set(override_dict.pop(M_OVERRIDDEN_KEY)) else: - overriden_keys = set() + overridden_keys = set() for key, value in override_dict.items(): - if (key in overriden_keys or key not in source_dict): + if (key in overridden_keys or key not in source_dict): source_dict[key] = value elif isinstance(value, dict) and isinstance(source_dict[key], dict): @@ -574,7 +574,7 @@ def apply_local_settings_on_system_settings(system_settings, local_settings): """Apply local settings on studio system settings. ATM local settings can modify only application executables. Executable - values are not overriden but prepended. + values are not overridden but prepended. """ if not local_settings or "applications" not in local_settings: return @@ -914,7 +914,7 @@ def get_environments(): """Calculated environment based on defaults and system settings. Any default environment also found in the system settings will be fully - overriden by the one from the system settings. + overridden by the one from the system settings. Returns: dict: Output should be ready for `acre` module. diff --git a/openpype/style/data.json b/openpype/style/data.json index 1db0c732cf..e65690378d 100644 --- a/openpype/style/data.json +++ b/openpype/style/data.json @@ -112,7 +112,7 @@ "breadcrumbs-btn-bg": "rgba(127, 127, 127, 60)", "breadcrumbs-btn-bg-hover": "rgba(127, 127, 127, 90)", - "content-hightlighted": "rgba(19, 26, 32, 15)", + "content-highlighted": "rgba(19, 26, 32, 15)", "focus-border": "#839caf", "image-btn": "#bfccd6", "image-btn-hover": "#189aea", diff --git a/openpype/style/style.css b/openpype/style/style.css index d9b0ff7421..03b7b522f9 100644 --- a/openpype/style/style.css +++ b/openpype/style/style.css @@ -1093,16 +1093,16 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { #ExpandLabel[state="modified"]:hover, #SettingsLabel[state="modified"]:hover { color: {color:settings:modified-light}; } -#ExpandLabel[state="overriden-modified"], #SettingsLabel[state="overriden-modified"] { +#ExpandLabel[state="overridden-modified"], #SettingsLabel[state="overridden-modified"] { color: {color:settings:modified-mid}; } -#ExpandLabel[state="overriden-modified"]:hover, #SettingsLabel[state="overriden-modified"]:hover { +#ExpandLabel[state="overridden-modified"]:hover, #SettingsLabel[state="overridden-modified"]:hover { color: {color:settings:modified-light}; } -#ExpandLabel[state="overriden"], #SettingsLabel[state="overriden"] { +#ExpandLabel[state="overridden"], #SettingsLabel[state="overridden"] { color: {color:settings:project-mid}; } -#ExpandLabel[state="overriden"]:hover, #SettingsLabel[state="overriden"]:hover { +#ExpandLabel[state="overridden"]:hover, #SettingsLabel[state="overridden"]:hover { color: {color:settings:project-light}; } #ExpandLabel[state="invalid"], #SettingsLabel[state="invalid"] { @@ -1116,10 +1116,10 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { #SettingsMainWidget QWidget[input-state="modified"] { border-color: {color:settings:modified-mid}; } -#SettingsMainWidget QWidget[input-state="overriden-modified"] { +#SettingsMainWidget QWidget[input-state="overridden-modified"] { border-color: {color:settings:modified-mid}; } -#SettingsMainWidget QWidget[input-state="overriden"] { +#SettingsMainWidget QWidget[input-state="overridden"] { border-color: {color:settings:project-mid}; } #SettingsMainWidget QWidget[input-state="invalid"] { @@ -1145,8 +1145,8 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { #ContentWidget { background-color: transparent; } -#ContentWidget[content_state="hightlighted"] { - background-color: {color:settings:content-hightlighted}; +#ContentWidget[content_state="highlighted"] { + background-color: {color:settings:content-highlighted}; } #SideLineWidget { @@ -1172,11 +1172,11 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { #SideLineWidget[state="child-invalid"] {border-color: {color:settings:invalid-dark};} #SideLineWidget[state="child-invalid"]:hover {border-color: {color:settings:invalid-light};} -#SideLineWidget[state="child-overriden"] {border-color: {color:settings:project-dark};} -#SideLineWidget[state="child-overriden"]:hover {border-color: {color:settings:project-mid};} +#SideLineWidget[state="child-overridden"] {border-color: {color:settings:project-dark};} +#SideLineWidget[state="child-overridden"]:hover {border-color: {color:settings:project-mid};} -#SideLineWidget[state="child-overriden-modified"] {border-color: {color:settings:modified-dark};} -#SideLineWidget[state="child-overriden-modified"]:hover {border-color: {color:settings:modified-mid};} +#SideLineWidget[state="child-overridden-modified"] {border-color: {color:settings:modified-dark};} +#SideLineWidget[state="child-overridden-modified"]:hover {border-color: {color:settings:modified-mid};} #DictAsWidgetBody { background: transparent; diff --git a/openpype/tests/test_avalon_plugin_presets.py b/openpype/tests/test_avalon_plugin_presets.py index cc1858554c..ec21385d23 100644 --- a/openpype/tests/test_avalon_plugin_presets.py +++ b/openpype/tests/test_avalon_plugin_presets.py @@ -32,9 +32,9 @@ def test_avalon_plugin_presets(monkeypatch, printer): assert MyTestCreator in plugins for p in plugins: if p.__name__ == "MyTestCreator": - printer("Test if we have overriden existing property") + printer("Test if we have overridden existing property") assert p.my_test_property == "B" - printer("Test if we have overriden superclass property") + printer("Test if we have overridden superclass property") assert p.active is False printer("Test if we have added new property") assert p.new_property == "new" diff --git a/openpype/tools/settings/local_settings/projects_widget.py b/openpype/tools/settings/local_settings/projects_widget.py index da45467a4e..30a0d212f0 100644 --- a/openpype/tools/settings/local_settings/projects_widget.py +++ b/openpype/tools/settings/local_settings/projects_widget.py @@ -126,7 +126,7 @@ class DynamicInputItem(QtCore.QObject): return "studio" else: if current_value: - return "overriden" + return "overridden" if self.value_item.default_value: return "studio" @@ -512,7 +512,7 @@ class _SiteCombobox(QtWidgets.QWidget): return "studio" else: if current_value: - return "overriden" + return "overridden" studio_value = self._get_local_settings_item(DEFAULT_PROJECT_KEY) if studio_value: diff --git a/openpype/tools/settings/settings/README.md b/openpype/tools/settings/settings/README.md index 31d8fc5b74..197f7a001a 100644 --- a/openpype/tools/settings/settings/README.md +++ b/openpype/tools/settings/settings/README.md @@ -10,7 +10,7 @@ - `"is_file"` - this key is for storing openpype defaults in `openpype` repo - reasons of existence: developing new schemas does not require to create defaults manually - key is validated, must be once in hierarchy else it won't be possible to store openpype defaults - - `"is_group"` - define that all values under key in hierarchy will be overriden if any value is modified, this information is also stored to overrides + - `"is_group"` - define that all values under key in hierarchy will be overridden if any value is modified, this information is also stored to overrides - this keys is not allowed for all inputs as they may have not reason for that - key is validated, can be only once in hierarchy but is not required - currently there are `system configurations` and `project configurations` diff --git a/openpype/tools/settings/settings/base.py b/openpype/tools/settings/settings/base.py index e271585852..c7b76add90 100644 --- a/openpype/tools/settings/settings/base.py +++ b/openpype/tools/settings/settings/base.py @@ -93,7 +93,7 @@ class BaseWidget(QtWidgets.QWidget): if is_modified: return "modified" if has_project_override: - return "overriden" + return "overridden" if has_studio_override: return "studio" return "" diff --git a/openpype/tools/settings/settings/dict_conditional.py b/openpype/tools/settings/settings/dict_conditional.py index 2e1617f505..b2a7bb52a2 100644 --- a/openpype/tools/settings/settings/dict_conditional.py +++ b/openpype/tools/settings/settings/dict_conditional.py @@ -183,7 +183,7 @@ class DictConditionalWidget(BaseWidget): content_widget.setObjectName("ContentWidget") if self.entity.highlight_content: - content_state = "hightlighted" + content_state = "highlighted" bottom_margin = 5 else: content_state = "" diff --git a/openpype/tools/settings/settings/dict_mutable_widget.py b/openpype/tools/settings/settings/dict_mutable_widget.py index 294711b38a..6489266131 100644 --- a/openpype/tools/settings/settings/dict_mutable_widget.py +++ b/openpype/tools/settings/settings/dict_mutable_widget.py @@ -354,7 +354,7 @@ class ModifiableDictItem(QtWidgets.QWidget): if self.entity.has_unsaved_changes: return "modified" if self.entity.has_project_override: - return "overriden" + return "overridden" if self.entity.has_studio_override: return "studio" return "" @@ -600,8 +600,8 @@ class DictMutableKeysWidget(BaseWidget): self.input_fields = [] self.required_inputs_by_key = {} - if self.entity.hightlight_content: - content_state = "hightlighted" + if self.entity.highlight_content: + content_state = "highlighted" bottom_margin = 5 else: content_state = "" diff --git a/openpype/tools/settings/settings/item_widgets.py b/openpype/tools/settings/settings/item_widgets.py index 22f672da2b..a8f5706d48 100644 --- a/openpype/tools/settings/settings/item_widgets.py +++ b/openpype/tools/settings/settings/item_widgets.py @@ -150,7 +150,7 @@ class DictImmutableKeysWidget(BaseWidget): content_widget.setObjectName("ContentWidget") if self.entity.highlight_content: - content_state = "hightlighted" + content_state = "highlighted" bottom_margin = 5 else: content_state = "" diff --git a/openpype/tools/utils/widgets.py b/openpype/tools/utils/widgets.py index c32eae043e..e82bced927 100644 --- a/openpype/tools/utils/widgets.py +++ b/openpype/tools/utils/widgets.py @@ -152,7 +152,7 @@ class OptionalMenu(QtWidgets.QMenu): """A subclass of `QtWidgets.QMenu` to work with `OptionalAction` This menu has reimplemented `mouseReleaseEvent`, `mouseMoveEvent` and - `leaveEvent` to provide better action hightlighting and triggering for + `leaveEvent` to provide better action highlighting and triggering for actions that were instances of `QtWidgets.QWidgetAction`. """ diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py index f4a86050cb..e389ac620a 100644 --- a/openpype/tools/workfiles/app.py +++ b/openpype/tools/workfiles/app.py @@ -833,7 +833,7 @@ class SidePanelWidget(QtWidgets.QWidget): self.note_input.setEnabled(enabled) self.btn_note_save.setEnabled(enabled) - # Make sure workfile doc is overriden + # Make sure workfile doc is overridden self._workfile_doc = workfile_doc # Disable inputs and remove texts if any required arguments are missing if not enabled: From 69bfcd6a305f976b3f4ee5f3f36c9e1ed2acbadb Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 31 Jan 2022 10:45:18 +0100 Subject: [PATCH 115/123] Update openpype/plugins/publish/collect_scene_version.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/plugins/publish/collect_scene_version.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openpype/plugins/publish/collect_scene_version.py b/openpype/plugins/publish/collect_scene_version.py index 56a6e3fb46..a81e85c1f5 100644 --- a/openpype/plugins/publish/collect_scene_version.py +++ b/openpype/plugins/publish/collect_scene_version.py @@ -35,9 +35,10 @@ class CollectSceneVersion(pyblish.api.ContextPlugin): def process(self, context): # tests should be close to regular publish as possible - if (context.data["hostName"] in self.skip_hosts_headless_publish - and os.environ.get("HEADLESS_PUBLISH") - and not os.environ.get("IS_TEST")): + if ( + os.environ.get("HEADLESS_PUBLISH") + and not os.environ.get("IS_TEST") + and context.data["hostName"] in self.skip_hosts_headless_publish): self.log.debug("Skipping for headless publishing") return From 336585bbc92001ae3d942cfd3092839a095195c0 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 31 Jan 2022 10:48:11 +0100 Subject: [PATCH 116/123] Update openpype/plugins/publish/collect_scene_version.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/plugins/publish/collect_scene_version.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/openpype/plugins/publish/collect_scene_version.py b/openpype/plugins/publish/collect_scene_version.py index a81e85c1f5..917647c61a 100644 --- a/openpype/plugins/publish/collect_scene_version.py +++ b/openpype/plugins/publish/collect_scene_version.py @@ -29,9 +29,7 @@ class CollectSceneVersion(pyblish.api.ContextPlugin): # in some cases of headless publishing (for example webpublisher using PS) # you want to ignore version from name and let integrate use next version - skip_hosts_headless_publish = [ - - ] + skip_hosts_headless_publish = [] def process(self, context): # tests should be close to regular publish as possible From f97a9a9bb45c81d60d98f02446d3a9fecebb450b Mon Sep 17 00:00:00 2001 From: murphy Date: Mon, 31 Jan 2022 11:33:59 +0100 Subject: [PATCH 117/123] few typos fixed --- website/docs/artist_concepts.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/artist_concepts.md b/website/docs/artist_concepts.md index 6046ba6214..4d195e9220 100644 --- a/website/docs/artist_concepts.md +++ b/website/docs/artist_concepts.md @@ -26,7 +26,7 @@ Each published variant can come out of the software in multiple representations. ### Family -Each published [subset][3b89d8e0] can have exactly one family assigned to it. Family determines the type of data that the subset holds. Family doesn't dictate the file type, but can enforce certain technical specifications. For example OpenPype default configuration expects `model` family to only contain geometry without any shaders or joins when it is published. +Each published [subset][3b89d8e0] can have exactly one family assigned to it. Family determines the type of data that the subset holds. Family doesn't dictate the file type, but can enforce certain technical specifications. For example OpenPype default configuration expects `model` family to only contain geometry without any shaders or joints when it is published. [3b89d8e0]: #subset "subset" @@ -40,7 +40,7 @@ General term for Software or Application supported by OpenPype and Avalon. These ### Tool -Small piece of software usually dedicated to a particular purpose. Most of OpenPype and Avalon tools have GUI, but some are command line only +Small piece of software usually dedicated to a particular purpose. Most of OpenPype and Avalon tools have GUI, but some are command line only. ### Publish @@ -50,4 +50,4 @@ Process of exporting data from your work scene to versioned, immutable file that ### Load Process of importing previously published subsets into your current scene, using any of the OpenPype tools. -Loading asset using proper tools will ensure that all your scene content stays version controlled and updatable at a later point +Loading asset using proper tools will ensure that all your scene content stays version controlled and updatable at a later point. From 29c4adb50788323fd07fb314b5846734acf4a1a6 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 31 Jan 2022 12:55:41 +0100 Subject: [PATCH 118/123] Fix - safer pulling of task name for webpublishing from PS --- .../publish/collect_remote_instances.py | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/openpype/hosts/photoshop/plugins/publish/collect_remote_instances.py b/openpype/hosts/photoshop/plugins/publish/collect_remote_instances.py index 3994048f7d..2a07c684da 100644 --- a/openpype/hosts/photoshop/plugins/publish/collect_remote_instances.py +++ b/openpype/hosts/photoshop/plugins/publish/collect_remote_instances.py @@ -4,7 +4,7 @@ import re import pyblish.api from openpype.lib import prepare_template_data -from openpype.lib.plugin_tools import parse_json +from openpype.lib.plugin_tools import parse_json, get_batch_asset_task_info from openpype.hosts.photoshop import api as photoshop @@ -29,26 +29,32 @@ class CollectRemoteInstances(pyblish.api.ContextPlugin): def process(self, context): self.log.info("CollectRemoteInstances") - self.log.info("mapping:: {}".format(self.color_code_mapping)) + self.log.debug("mapping:: {}".format(self.color_code_mapping)) # parse variant if used in webpublishing, comes from webpublisher batch batch_dir = os.environ.get("OPENPYPE_PUBLISH_DATA") - variant = "Main" + task_data = None if batch_dir and os.path.exists(batch_dir): # TODO check if batch manifest is same as tasks manifests task_data = parse_json(os.path.join(batch_dir, "manifest.json")) - if not task_data: - raise ValueError( - "Cannot parse batch meta in {} folder".format(batch_dir)) - variant = task_data["variant"] + if not task_data: + raise ValueError( + "Cannot parse batch meta in {} folder".format(batch_dir)) + variant = task_data["variant"] stub = photoshop.stub() layers = stub.get_layers() + asset, task_name, task_type = get_batch_asset_task_info( + task_data["context"]) + + if not task_name: + task_name = task_type + instance_names = [] for layer in layers: - self.log.info("Layer:: {}".format(layer)) + self.log.debug("Layer:: {}".format(layer)) resolved_family, resolved_subset_template = self._resolve_mapping( layer ) @@ -57,7 +63,7 @@ class CollectRemoteInstances(pyblish.api.ContextPlugin): resolved_subset_template)) if not resolved_subset_template or not resolved_family: - self.log.debug("!!! Not marked, skip") + self.log.debug("!!! Not found family or template, skip") continue if layer.parents: @@ -68,8 +74,8 @@ class CollectRemoteInstances(pyblish.api.ContextPlugin): instance.append(layer) instance.data["family"] = resolved_family instance.data["publish"] = layer.visible - instance.data["asset"] = context.data["assetEntity"]["name"] - instance.data["task"] = context.data["task"] + instance.data["asset"] = asset + instance.data["task"] = task_name fill_pairs = { "variant": variant, @@ -114,7 +120,6 @@ class CollectRemoteInstances(pyblish.api.ContextPlugin): family_list.append(mapping["family"]) subset_name_list.append(mapping["subset_template_name"]) - if len(subset_name_list) > 1: self.log.warning("Multiple mappings found for '{}'". format(layer.name)) From bdfdc38b7284c56cbb5089f0b0f8c364b5a79daa Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 31 Jan 2022 14:28:27 +0100 Subject: [PATCH 119/123] Make sure current value in enum match with valid keys --- .../defaults/project_settings/photoshop.json | 2 +- openpype/settings/entities/enum_entity.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_settings/photoshop.json b/openpype/settings/defaults/project_settings/photoshop.json index db9bf87268..31cd815dd8 100644 --- a/openpype/settings/defaults/project_settings/photoshop.json +++ b/openpype/settings/defaults/project_settings/photoshop.json @@ -12,7 +12,7 @@ { "color_code": [], "layer_name_regex": [], - "family": "", + "family": "image", "subset_template_name": "" } ] diff --git a/openpype/settings/entities/enum_entity.py b/openpype/settings/entities/enum_entity.py index fb6099e82a..0fcd8f3002 100644 --- a/openpype/settings/entities/enum_entity.py +++ b/openpype/settings/entities/enum_entity.py @@ -121,6 +121,20 @@ class EnumEntity(BaseEnumEntity): ) super(EnumEntity, self).schema_validations() + def set_override_state(self, *args, **kwargs): + super(EnumEntity, self).set_override_state(*args, **kwargs) + + # Make sure current value is valid + if self.multiselection: + new_value = [] + for key in self._current_value: + if key in self.valid_keys: + new_value.append(key) + self._current_value = new_value + + elif self._current_value not in self.valid_keys: + self._current_value = self.value_on_not_set + class HostsEnumEntity(BaseEnumEntity): """Enumeration of host names. From ec3b535f760c4e7bcae528776c449e8726327755 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 31 Jan 2022 23:08:41 +0100 Subject: [PATCH 120/123] Revert string value for M_OVERRIDDEN_KEY for backwards compatibility Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- openpype/settings/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/constants.py b/openpype/settings/constants.py index 9fd0d5b417..8cc991c999 100644 --- a/openpype/settings/constants.py +++ b/openpype/settings/constants.py @@ -2,7 +2,7 @@ import re # Metadata keys for work with studio and project overrides -M_OVERRIDDEN_KEY = "__overridden_keys__" +M_OVERRIDDEN_KEY = "__overriden_keys__" # Metadata key for storing information about environments M_ENVIRONMENT_KEY = "__environment_keys__" # Metadata key for storing dynamic created labels From 304d85510314636516b7a26e32e2ee4d2264cb19 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Tue, 1 Feb 2022 10:57:15 +0100 Subject: [PATCH 121/123] add extension on windows --- openpype/lib/vendor_bin_utils.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/openpype/lib/vendor_bin_utils.py b/openpype/lib/vendor_bin_utils.py index a5d4153b2a..4c2cf93dfa 100644 --- a/openpype/lib/vendor_bin_utils.py +++ b/openpype/lib/vendor_bin_utils.py @@ -34,11 +34,17 @@ def get_vendor_bin_path(bin_app): def get_oiio_tools_path(tool="oiiotool"): """Path to vendorized OpenImageIO tool executables. + On Window it adds .exe extension if missing from tool argument. + Args: tool (string): Tool name (oiiotool, maketx, ...). Default is "oiiotool". """ oiio_dir = get_vendor_bin_path("oiio") + if platform.system().lower() == "windows" and not tool.lower().endswith( + ".exe" + ): + tool = "{}.exe".format(tool) return os.path.join(oiio_dir, tool) From 1b6b39051faac296e9af4fa1f6aac2d16d9df9bb Mon Sep 17 00:00:00 2001 From: OpenPype Date: Tue, 1 Feb 2022 11:43:50 +0000 Subject: [PATCH 122/123] [Automated] Bump version --- CHANGELOG.md | 12 ++++++++++-- openpype/version.py | 2 +- pyproject.toml | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a90f2ce01..88d2976b5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [3.8.1-nightly.2](https://github.com/pypeclub/OpenPype/tree/HEAD) +## [3.8.1-nightly.3](https://github.com/pypeclub/OpenPype/tree/HEAD) [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.8.0...HEAD) @@ -8,9 +8,13 @@ - Webpublisher: Thumbnail extractor [\#2600](https://github.com/pypeclub/OpenPype/pull/2600) - Loader: Allow to toggle default family filters between "include" or "exclude" filtering [\#2541](https://github.com/pypeclub/OpenPype/pull/2541) +- Launcher: Added context menu to to skip opening last workfile [\#2536](https://github.com/pypeclub/OpenPype/pull/2536) **🐛 Bug fixes** +- Release/3.8.0 [\#2619](https://github.com/pypeclub/OpenPype/pull/2619) +- hotfix: OIIO tool path - add extension on windows [\#2618](https://github.com/pypeclub/OpenPype/pull/2618) +- Settings: Enum does not store empty string if has single item to select [\#2615](https://github.com/pypeclub/OpenPype/pull/2615) - switch distutils to sysconfig for `get\_platform\(\)` [\#2594](https://github.com/pypeclub/OpenPype/pull/2594) - Fix poetry index and speedcopy update [\#2589](https://github.com/pypeclub/OpenPype/pull/2589) - Webpublisher: Fix - subset names from processed .psd used wrong value for task [\#2586](https://github.com/pypeclub/OpenPype/pull/2586) @@ -21,6 +25,7 @@ **Merged pull requests:** - Bump pillow from 8.4.0 to 9.0.0 [\#2595](https://github.com/pypeclub/OpenPype/pull/2595) +- Webpublisher: Skip version collect [\#2591](https://github.com/pypeclub/OpenPype/pull/2591) - build\(deps\): bump pillow from 8.4.0 to 9.0.0 [\#2523](https://github.com/pypeclub/OpenPype/pull/2523) ## [3.8.0](https://github.com/pypeclub/OpenPype/tree/3.8.0) (2022-01-24) @@ -74,7 +79,6 @@ - Fix published frame content for sequence starting with 0 [\#2513](https://github.com/pypeclub/OpenPype/pull/2513) - Maya: reset empty string attributes correctly to "" instead of "None" [\#2506](https://github.com/pypeclub/OpenPype/pull/2506) - Improve FusionPreLaunch hook errors [\#2505](https://github.com/pypeclub/OpenPype/pull/2505) -- Maya: Validate Shape Zero do not keep fixed geometry vertices selected/active after repair [\#2456](https://github.com/pypeclub/OpenPype/pull/2456) **Merged pull requests:** @@ -92,6 +96,10 @@ - General: Workdir extra folders [\#2462](https://github.com/pypeclub/OpenPype/pull/2462) +**🐛 Bug fixes** + +- TVPaint: Create render layer dialog is in front [\#2471](https://github.com/pypeclub/OpenPype/pull/2471) + ## [3.6.4](https://github.com/pypeclub/OpenPype/tree/3.6.4) (2021-11-23) [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.7.0-nightly.1...3.6.4) diff --git a/openpype/version.py b/openpype/version.py index 7e19430e70..85480d1fd7 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.8.1-nightly.2" +__version__ = "3.8.1-nightly.3" diff --git a/pyproject.toml b/pyproject.toml index 8ef0c1b52e..5c19b6da8d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "OpenPype" -version = "3.8.1-nightly.2" # OpenPype +version = "3.8.1-nightly.3" # OpenPype description = "Open VFX and Animation pipeline with support." authors = ["OpenPype Team "] license = "MIT License" From c49c9ef26ec7b8695b87222acfae78b56e07a0a2 Mon Sep 17 00:00:00 2001 From: OpenPype Date: Tue, 1 Feb 2022 11:50:35 +0000 Subject: [PATCH 123/123] [Automated] Release --- CHANGELOG.md | 19 ++++++++++--------- openpype/version.py | 2 +- pyproject.toml | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88d2976b5f..ad2f001b45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,13 @@ # Changelog -## [3.8.1-nightly.3](https://github.com/pypeclub/OpenPype/tree/HEAD) +## [3.8.1](https://github.com/pypeclub/OpenPype/tree/3.8.1) (2022-02-01) -[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.8.0...HEAD) +[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.8.0...3.8.1) **🚀 Enhancements** - Webpublisher: Thumbnail extractor [\#2600](https://github.com/pypeclub/OpenPype/pull/2600) - Loader: Allow to toggle default family filters between "include" or "exclude" filtering [\#2541](https://github.com/pypeclub/OpenPype/pull/2541) -- Launcher: Added context menu to to skip opening last workfile [\#2536](https://github.com/pypeclub/OpenPype/pull/2536) **🐛 Bug fixes** @@ -20,22 +19,20 @@ - Webpublisher: Fix - subset names from processed .psd used wrong value for task [\#2586](https://github.com/pypeclub/OpenPype/pull/2586) - `vrscene` creator Deadline webservice URL handling [\#2580](https://github.com/pypeclub/OpenPype/pull/2580) - global: track name was failing if duplicated root word in name [\#2568](https://github.com/pypeclub/OpenPype/pull/2568) +- General: Do not validate version if build does not support it [\#2557](https://github.com/pypeclub/OpenPype/pull/2557) - Validate Maya Rig produces no cycle errors [\#2484](https://github.com/pypeclub/OpenPype/pull/2484) **Merged pull requests:** - Bump pillow from 8.4.0 to 9.0.0 [\#2595](https://github.com/pypeclub/OpenPype/pull/2595) - Webpublisher: Skip version collect [\#2591](https://github.com/pypeclub/OpenPype/pull/2591) +- build\(deps\): bump follow-redirects from 1.14.4 to 1.14.7 in /website [\#2534](https://github.com/pypeclub/OpenPype/pull/2534) - build\(deps\): bump pillow from 8.4.0 to 9.0.0 [\#2523](https://github.com/pypeclub/OpenPype/pull/2523) ## [3.8.0](https://github.com/pypeclub/OpenPype/tree/3.8.0) (2022-01-24) [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.8.0-nightly.7...3.8.0) -### 📖 Documentation - -- Variable in docs renamed to proper name [\#2546](https://github.com/pypeclub/OpenPype/pull/2546) - **🆕 New features** - Flame: extracting segments with trans-coding [\#2547](https://github.com/pypeclub/OpenPype/pull/2547) @@ -52,6 +49,7 @@ - Settings: PathInput strip passed string [\#2550](https://github.com/pypeclub/OpenPype/pull/2550) - Global: Exctract Review anatomy fill data with output name [\#2548](https://github.com/pypeclub/OpenPype/pull/2548) - Cosmetics: Clean up some cosmetics / typos [\#2542](https://github.com/pypeclub/OpenPype/pull/2542) +- Launcher: Added context menu to to skip opening last workfile [\#2536](https://github.com/pypeclub/OpenPype/pull/2536) - General: Validate if current process OpenPype version is requested version [\#2529](https://github.com/pypeclub/OpenPype/pull/2529) - General: Be able to use anatomy data in ffmpeg output arguments [\#2525](https://github.com/pypeclub/OpenPype/pull/2525) - Expose toggle publish plug-in settings for Maya Look Shading Engine Naming [\#2521](https://github.com/pypeclub/OpenPype/pull/2521) @@ -66,7 +64,6 @@ - General: OpenPype version updates [\#2575](https://github.com/pypeclub/OpenPype/pull/2575) - Ftrack: Delete action revision [\#2563](https://github.com/pypeclub/OpenPype/pull/2563) - Webpublisher: ftrack shows incorrect user names [\#2560](https://github.com/pypeclub/OpenPype/pull/2560) -- General: Do not validate version if build does not support it [\#2557](https://github.com/pypeclub/OpenPype/pull/2557) - Webpublisher: Fixed progress reporting [\#2553](https://github.com/pypeclub/OpenPype/pull/2553) - Fix Maya AssProxyLoader version switch [\#2551](https://github.com/pypeclub/OpenPype/pull/2551) - General: Fix install thread in igniter [\#2549](https://github.com/pypeclub/OpenPype/pull/2549) @@ -79,13 +76,17 @@ - Fix published frame content for sequence starting with 0 [\#2513](https://github.com/pypeclub/OpenPype/pull/2513) - Maya: reset empty string attributes correctly to "" instead of "None" [\#2506](https://github.com/pypeclub/OpenPype/pull/2506) - Improve FusionPreLaunch hook errors [\#2505](https://github.com/pypeclub/OpenPype/pull/2505) +- General: Modules import function output fix [\#2492](https://github.com/pypeclub/OpenPype/pull/2492) + +### 📖 Documentation + +- Variable in docs renamed to proper name [\#2546](https://github.com/pypeclub/OpenPype/pull/2546) **Merged pull requests:** - AfterEffects: Move implementation to OpenPype [\#2543](https://github.com/pypeclub/OpenPype/pull/2543) - Maya: Remove Maya Look Assigner check on startup [\#2540](https://github.com/pypeclub/OpenPype/pull/2540) - build\(deps\): bump shelljs from 0.8.4 to 0.8.5 in /website [\#2538](https://github.com/pypeclub/OpenPype/pull/2538) -- build\(deps\): bump follow-redirects from 1.14.4 to 1.14.7 in /website [\#2534](https://github.com/pypeclub/OpenPype/pull/2534) - Nuke: Merge avalon's implementation into OpenPype [\#2514](https://github.com/pypeclub/OpenPype/pull/2514) ## [3.7.0](https://github.com/pypeclub/OpenPype/tree/3.7.0) (2022-01-04) diff --git a/openpype/version.py b/openpype/version.py index 85480d1fd7..c573c57637 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.8.1-nightly.3" +__version__ = "3.8.1" diff --git a/pyproject.toml b/pyproject.toml index 5c19b6da8d..56d059e447 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "OpenPype" -version = "3.8.1-nightly.3" # OpenPype +version = "3.8.1" # OpenPype description = "Open VFX and Animation pipeline with support." authors = ["OpenPype Team "] license = "MIT License"