Merge branch 'develop' into bugfix/nuke-monitor-thumbnail-profiles

This commit is contained in:
Jakub Ježek 2023-08-31 12:09:41 +02:00 committed by GitHub
commit 0935c75814
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 1312 additions and 402 deletions

View file

@ -543,6 +543,9 @@ def list_instances(creator_id=None):
For SubsetManager
Args:
creator_id (Optional[str]): creator identifier
Returns:
(list) of dictionaries matching instances format
"""
@ -575,10 +578,13 @@ def list_instances(creator_id=None):
if creator_id and instance_data["creator_identifier"] != creator_id:
continue
if instance_data["instance_id"] in instance_ids:
instance_id = instance_data.get("instance_id")
if not instance_id:
pass
elif instance_id in instance_ids:
instance_data.pop("instance_id")
else:
instance_ids.add(instance_data["instance_id"])
instance_ids.add(instance_id)
# node name could change, so update subset name data
_update_subset_name_data(instance_data, node)

View file

@ -327,6 +327,7 @@ class NukeWriteCreator(NukeCreator):
"frames": "Use existing frames"
}
if ("farm_rendering" in self.instance_attributes):
rendering_targets["frames_farm"] = "Use existing frames - farm"
rendering_targets["farm"] = "Farm rendering"
return EnumDef(