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

upversion for maya server addon & fix on repair action in validate resolution

Browse source
This commit is contained in:
Kayla Man 2023-10-06 22:50:16 +08:00
parent 64b03447f1
commit dd46d48ffc
2 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

46
openpype/hosts/maya/plugins/publish/validate_resolution.py
View file

@ -13,7 +13,7 @@ class ValidateResolution(pyblish.api.InstancePlugin,
OptionalPyblishPluginMixin): OptionalPyblishPluginMixin):
"""Validate the render resolution setting aligned with DB""" """Validate the render resolution setting aligned with DB"""
order = pyblish.api.ValidatorOrder - 0.01 order = pyblish.api.ValidatorOrder
families = ["renderlayer"] families = ["renderlayer"]
hosts = ["maya"] hosts = ["maya"]
label = "Validate Resolution" label = "Validate Resolution"
@ -26,14 +26,17 @@ class ValidateResolution(pyblish.api.InstancePlugin,
invalid = self.get_invalid_resolution(instance) invalid = self.get_invalid_resolution(instance)
if invalid: if invalid:
raise PublishValidationError( raise PublishValidationError(
"issues occurred", description=( "Render resolution is invalid. See log for details.",
description=(
"Wrong render resolution setting. " "Wrong render resolution setting. "
"Please use repair button to fix it.\n" "Please use repair button to fix it.\n"
"If current renderer is V-Ray, " "If current renderer is V-Ray, "
"make sure vraySettings node has been created")) "make sure vraySettings node has been created"
)
def get_invalid_resolution(self, instance): )
width, height, pixelAspect = self.get_db_resolution(instance) @classmethod
def get_invalid_resolution(cls, instance):
width, height, pixelAspect = cls.get_db_resolution(instance)
current_renderer = instance.data["renderer"] current_renderer = instance.data["renderer"]
layer = instance.data["renderlayer"] layer = instance.data["renderlayer"]
invalid = False invalid = False
@ -48,11 +51,11 @@ class ValidateResolution(pyblish.api.InstancePlugin,
"{}.pixelAspect".format(vray_node), layer=layer "{}.pixelAspect".format(vray_node), layer=layer
) )
else: else:
self.log.error( cls.log.error(
"Can't detect VRay resolution because there is no node " "Can't detect VRay resolution because there is no node "
"named: `{}`".format(vray_node) "named: `{}`".format(vray_node)
) )
invalid = True return True
else: else:
current_width = lib.get_attr_in_layer( current_width = lib.get_attr_in_layer(
"defaultResolution.width", layer=layer) "defaultResolution.width", layer=layer)
@ -62,7 +65,7 @@ class ValidateResolution(pyblish.api.InstancePlugin,
"defaultResolution.pixelAspect", layer=layer "defaultResolution.pixelAspect", layer=layer
) )
if current_width != width or current_height != height: if current_width != width or current_height != height:
self.log.error( cls.log.error(
"Render resolution {}x{} does not match " "Render resolution {}x{} does not match "
"asset resolution {}x{}".format( "asset resolution {}x{}".format(
current_width, current_height, current_width, current_height,
@ -70,7 +73,7 @@ class ValidateResolution(pyblish.api.InstancePlugin,
)) ))
invalid = True invalid = True
if current_pixelAspect != pixelAspect: if current_pixelAspect != pixelAspect:
self.log.error( cls.log.error(
"Render pixel aspect {} does not match " "Render pixel aspect {} does not match "
"asset pixel aspect {}".format( "asset pixel aspect {}".format(
current_pixelAspect, pixelAspect current_pixelAspect, pixelAspect
@ -78,12 +81,15 @@ class ValidateResolution(pyblish.api.InstancePlugin,
invalid = True invalid = True
return invalid return invalid
def get_db_resolution(self, instance): @classmethod
def get_db_resolution(cls, instance):
asset_doc = instance.data["assetEntity"] asset_doc = instance.data["assetEntity"]
project_doc = instance.context.data["projectEntity"] project_doc = instance.context.data["projectEntity"]
for data in [asset_doc["data"], project_doc["data"]]: for data in [asset_doc["data"], project_doc["data"]]:
if "resolutionWidth" in data and ( if (
"resolutionHeight" in data and "pixelAspect" in data "resolutionWidth" in data and
"resolutionHeight" in data and
"pixelAspect" in data
): ):
width = data["resolutionWidth"] width = data["resolutionWidth"]
height = data["resolutionHeight"] height = data["resolutionHeight"]
@ -95,6 +101,16 @@ class ValidateResolution(pyblish.api.InstancePlugin,
@classmethod @classmethod
def repair(cls, instance): def repair(cls, instance):
layer = instance.data["renderlayer"] # Usually without renderlayer overrides the renderlayers
with lib.renderlayer(layer): # all share the same resolution value - so fixing the first
# will have fixed all the others too. It's much faster to
# check whether it's invalid first instead of switching
# into all layers individually
if not cls.get_invalid_resolution(instance):
cls.log.debug(
"Nothing to repair on instance: {}".format(instance)
)
return
layer_node = instance.data['setMembers']
with lib.renderlayer(layer_node):
reset_scene_resolution() reset_scene_resolution()

2
server_addon/maya/server/version.py
View file

@ -1,3 +1,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""Package declaring addon version.""" """Package declaring addon version."""
__version__ = "0.1.4" __version__ = "0.1.5"