mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 12:54:40 +01:00
Merge pull request #1594 from BigRoy/1593-yn-0303-thumbnail-and-review-colorspace-is-off
This commit is contained in:
commit
31e6b5a139
1 changed files with 10 additions and 7 deletions
|
|
@ -1234,17 +1234,11 @@ def oiio_color_convert(
|
||||||
if source_view and source_display:
|
if source_view and source_display:
|
||||||
color_convert_args = None
|
color_convert_args = None
|
||||||
ocio_display_args = None
|
ocio_display_args = None
|
||||||
oiio_cmd.extend([
|
|
||||||
"--ociodisplay:inverse=1:subimages=0",
|
|
||||||
source_display,
|
|
||||||
source_view,
|
|
||||||
])
|
|
||||||
|
|
||||||
if target_colorspace:
|
if target_colorspace:
|
||||||
# This is a two-step conversion process since there's no direct
|
# This is a two-step conversion process since there's no direct
|
||||||
# display/view to colorspace command
|
# display/view to colorspace command
|
||||||
# This could be a config parameter or determined from OCIO config
|
# This could be a config parameter or determined from OCIO config
|
||||||
# Use temporarty role space 'scene_linear'
|
# Use temporary role space 'scene_linear'
|
||||||
color_convert_args = ("scene_linear", target_colorspace)
|
color_convert_args = ("scene_linear", target_colorspace)
|
||||||
elif source_display != target_display or source_view != target_view:
|
elif source_display != target_display or source_view != target_view:
|
||||||
# Complete display/view pair conversion
|
# Complete display/view pair conversion
|
||||||
|
|
@ -1256,6 +1250,15 @@ def oiio_color_convert(
|
||||||
" No color conversion needed."
|
" No color conversion needed."
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if color_convert_args or ocio_display_args:
|
||||||
|
# Invert source display/view so that we can go from there to the
|
||||||
|
# target colorspace or display/view
|
||||||
|
oiio_cmd.extend([
|
||||||
|
"--ociodisplay:inverse=1:subimages=0",
|
||||||
|
source_display,
|
||||||
|
source_view,
|
||||||
|
])
|
||||||
|
|
||||||
if color_convert_args:
|
if color_convert_args:
|
||||||
# Use colorconvert for colorspace target
|
# Use colorconvert for colorspace target
|
||||||
oiio_cmd.extend([
|
oiio_cmd.extend([
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue