griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Crash with certain OCIO configs in display descriptions

Browse Source 
This was incorrectly assuming displays have a corresponding colorspace
with the same name.

Pull Request: https://projects.blender.org/blender/blender/pulls/146481
This commit is contained in:
Brecht Van Lommel
2025-09-20 13:14:04 +02:00
committed by Brecht Van Lommel
parent 0827fb50b1
commit 92a4aee3f9
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/imbuf/opencolorio/intern/libocio/libocio_display.cc
View File

@@ -43,7 +43,6 @@ LibOCIODisplay::LibOCIODisplay(const int index, const LibOCIOConfig &config) : c
this->index = index;
name_ = ocio_config->getDisplay(index);
description_ = ocio_config->getColorSpace(name_.c_str())->getDescription();
/* Initialize views. */
const int num_views = ocio_config->getNumViews(name_.c_str());
@@ -58,6 +57,15 @@ LibOCIODisplay::LibOCIODisplay(const int index, const LibOCIOConfig &config) : c
OCIO_NAMESPACE::ConstColorSpaceRcPtr ocio_display_colorspace = get_display_view_colorspace(
ocio_config, name_.c_str(), view_name);
/* There does not exist a description for displays, if there is an associated display
* colorspace it's likely to be a useful description. */
if (description_.is_empty() && ocio_display_colorspace &&
ocio_display_colorspace->getReferenceSpaceType() ==
OCIO_NAMESPACE::REFERENCE_SPACE_DISPLAY)
{
description_ = ocio_display_colorspace->getDescription();
}
const char *view_description = nullptr;
const char *view_transform_name = ocio_config->getDisplayViewTransformName(name_.c_str(),
view_name);