Validate persisted OCIO preferences against the active config

A display or view saved in preferences.ini that doesn't exist in the current
OCIO config made HdxColorCorrectionTask throw every frame
("DisplayViewTransform error. Display 'x' not found") and silently skip color
correction, which reads as a washed-out viewport -- worst on delegates like
hdEmbree whose output depends on the transform actually running.

The two are easy to invert: in the bundled ACES 1.2 config the only display is
"ACES" and "sRGB" is one of its views, but the shipped preferences had
OcioDisplay=sRGB and OcioView="ACES 1.0 SDR-video" (an OCIO-v2 studio-config
view that doesn't exist here). Nothing validated them -- LoadPreferences fed
ApplyGlobalColorCorrection directly, and the only existing fallback lived in
the preferences dialog and triggered on empty, never on invalid.

ValidateOcioPreferences() now runs right after LoadPreferences() so both the
viewport and the Material Editor see corrected values:
- display falls back to the config default when missing
- view is checked against the *resolved* display's view list, since correcting
  the display can invalidate the view; prefers the config default view when
  valid for that display, else its first view
- color space and look are cleared when they name something absent, as they
  fail the same way (note the real name is "ACES - ACEScg", not "ACEScg")
- no-op when the config is unreadable, so a missing $OCIO doesn't clobber
  values that may be correct for a config supplied later

Each correction logs a warning naming the old and new value.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

This commit is contained in:

indigo

2026-08-04 10:24:24 +08:00

parent a907ec0182

commit 05201465be

2 changed files with 75 additions and 0 deletions

									
										src/ui/Application.h
									
		+4
		
												View File
												
				@@ -79,6 +79,10 @@ private:

				    // Preferences

				    void LoadPreferences();

				    void SavePreferences();

				    /// Reconcile persisted OCIO display/view names against the active config.

				    /// Falls back to the config defaults when a name doesn't exist, so a stale

				    /// or mistyped preference can't silently disable color correction.

				    void ValidateOcioPreferences();

				    void ApplyPrefsToAllViewports();

				    void RenderPreferencesDialog();