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

Merge pull request #4650 from BigRoy/maya_collect_renderlayer_error_fix_4648

Browse source
This commit is contained in:
Milan Kolar 2023-04-03 17:54:52 +02:00 • committed by GitHub
commit e670ac772d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
openpype/hosts/maya/api/lib_renderproducts.py
View file

@ -857,6 +857,7 @@ class RenderProductsVray(ARenderProducts):
if default_ext in {"exr (multichannel)", "exr (deep)"}: if default_ext in {"exr (multichannel)", "exr (deep)"}:
default_ext = "exr" default_ext = "exr"
colorspace = lib.get_color_management_output_transform()
products = [] products = []
# add beauty as default when not disabled # add beauty as default when not disabled
@ -868,7 +869,7 @@ class RenderProductsVray(ARenderProducts):
productName="", productName="",
ext=default_ext, ext=default_ext,
camera=camera, camera=camera,
colorspace=lib.get_color_management_output_transform(), colorspace=colorspace,
multipart=self.multipart multipart=self.multipart
) )
) )
@ -882,6 +883,7 @@ class RenderProductsVray(ARenderProducts):
productName="Alpha", productName="Alpha",
ext=default_ext, ext=default_ext,
camera=camera, camera=camera,
colorspace=colorspace,
multipart=self.multipart multipart=self.multipart
) )
) )
@ -917,7 +919,8 @@ class RenderProductsVray(ARenderProducts):
product = RenderProduct(productName=name, product = RenderProduct(productName=name,
ext=default_ext, ext=default_ext,
aov=aov, aov=aov,
camera=camera) camera=camera,
colorspace=colorspace)
products.append(product) products.append(product)
# Continue as we've processed this special case AOV # Continue as we've processed this special case AOV
continue continue
@ -929,7 +932,7 @@ class RenderProductsVray(ARenderProducts):
ext=default_ext, ext=default_ext,
aov=aov, aov=aov,
camera=camera, camera=camera,
colorspace=lib.get_color_management_output_transform() colorspace=colorspace
) )
products.append(product) products.append(product)
@ -1130,6 +1133,7 @@ class RenderProductsRedshift(ARenderProducts):
products = [] products = []
light_groups_enabled = False light_groups_enabled = False
has_beauty_aov = False has_beauty_aov = False
colorspace = lib.get_color_management_output_transform()
for aov in aovs: for aov in aovs:
enabled = self._get_attr(aov, "enabled") enabled = self._get_attr(aov, "enabled")
if not enabled: if not enabled:
@ -1173,7 +1177,8 @@ class RenderProductsRedshift(ARenderProducts):
ext=ext, ext=ext,
multipart=False, multipart=False,
camera=camera, camera=camera,
driver=aov) driver=aov,
colorspace=colorspace)
products.append(product) products.append(product)
if light_groups: if light_groups:
@ -1188,7 +1193,8 @@ class RenderProductsRedshift(ARenderProducts):
ext=ext, ext=ext,
multipart=False, multipart=False,
camera=camera, camera=camera,
driver=aov) driver=aov,
colorspace=colorspace)
products.append(product) products.append(product)
# When a Beauty AOV is added manually, it will be rendered as # When a Beauty AOV is added manually, it will be rendered as
@ -1204,7 +1210,8 @@ class RenderProductsRedshift(ARenderProducts):
RenderProduct(productName=beauty_name, RenderProduct(productName=beauty_name,
ext=ext, ext=ext,
multipart=self.multipart, multipart=self.multipart,
camera=camera)) camera=camera,
colorspace=colorspace))
return products return products
@ -1236,6 +1243,8 @@ class RenderProductsRenderman(ARenderProducts):
""" """
from rfm2.api.displays import get_displays # noqa from rfm2.api.displays import get_displays # noqa
colorspace = lib.get_color_management_output_transform()
cameras = [ cameras = [
self.sanitize_camera_name(c) self.sanitize_camera_name(c)
for c in self.get_renderable_cameras() for c in self.get_renderable_cameras()
@ -1302,7 +1311,8 @@ class RenderProductsRenderman(ARenderProducts):
productName=aov_name, productName=aov_name,
ext=extensions, ext=extensions,
camera=camera, camera=camera,
multipart=True multipart=True,
colorspace=colorspace
) )
if has_cryptomatte and matte_enabled: if has_cryptomatte and matte_enabled:
@ -1311,7 +1321,8 @@ class RenderProductsRenderman(ARenderProducts):
aov=cryptomatte_aov, aov=cryptomatte_aov,
ext=extensions, ext=extensions,
camera=camera, camera=camera,
multipart=True multipart=True,
colorspace=colorspace
) )
else: else:
# this code should handle the case where no multipart # this code should handle the case where no multipart