Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2022-02-17 22:30:45 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-02-17 22:30:45 +0300
commit9153bf24cbf2402d57a24a1cd4e523e0c644bf08 (patch)
tree8331cafbab5b5e152493c58a31b537ab376f553b /intern/cycles/scene/shader.cpp
parentad2577e0cdc7be82005e777a388b415a788f0c44 (diff)
parent3cdbeb32d3779a0e6a89d2529c15f737cc32eae9 (diff)
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'intern/cycles/scene/shader.cpp')
-rw-r--r--intern/cycles/scene/shader.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/intern/cycles/scene/shader.cpp b/intern/cycles/scene/shader.cpp
index 07316a5214f..8a08f2a5be9 100644
--- a/intern/cycles/scene/shader.cpp
+++ b/intern/cycles/scene/shader.cpp
@@ -825,18 +825,18 @@ void ShaderManager::init_xyz_transforms()
/* This is the OpenColorIO builtin transform:
* UTILITY - ACES-AP0_to_CIE-XYZ-D65_BFD. */
- const Transform ACES_AP0_to_xyz_D65 = make_transform(0.938280,
- -0.004451,
- 0.016628,
- 0.000000,
- 0.337369,
- 0.729522,
- -0.066890,
- 0.000000,
- 0.001174,
- -0.003711,
- 1.091595,
- 0.000000);
+ const Transform ACES_AP0_to_xyz_D65 = make_transform(0.938280f,
+ -0.004451f,
+ 0.016628f,
+ 0.000000f,
+ 0.337369f,
+ 0.729522f,
+ -0.066890f,
+ 0.000000f,
+ 0.001174f,
+ -0.003711f,
+ 1.091595f,
+ 0.000000f);
const Transform xyz_to_aces = transform_inverse(ACES_AP0_to_xyz_D65);
xyz_to_rgb = aces_to_rgb * xyz_to_aces;
}