Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle conflict with recent develop

Browse source 
Added explicit disabling of adding review.
This commit is contained in:
Petr Kalis 2023-05-11 11:10:42 +02:00
parent fe08d8d729
commit b654b10e04
3 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
openpype/modules/royalrender/plugins/publish/create_publish_royalrender_job.py
View file

@ -88,10 +88,16 @@ class CreatePublishRoyalRenderJob(InstancePlugin):
families_transfer=self.families_transfer,
instance_transfer=self.instance_transfer)
do_not_add_review = False
if instance.data.get("review") is False:
self.log.debug("Instance has review explicitly disabled.")
do_not_add_review = True
if isinstance(instance.data.get("expectedFiles")[0], dict):
instances = create_instances_for_aov(
instance, instance_skeleton_data,
self.aov_filter, self.skip_integration_repre_list)
self.aov_filter, self.skip_integration_repre_list,
do_not_add_review)
else:
representations = prepare_representations(
@ -99,7 +105,8 @@ class CreatePublishRoyalRenderJob(InstancePlugin):
instance.data.get("expectedFiles"),
self.anatomy,
self.aov_filter,
self.skip_integration_repre_list
self.skip_integration_repre_list,
do_not_add_review
)
if "representations" not in instance_skeleton_data.keys():