Commit: 3cdbeb32d3779a0e6a89d2529c15f737cc32eae9
Author: Brecht Van Lommel
Date: Thu Feb 17 20:27:45 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rB3cdbeb32d3779a0e6a89d2529c15f737cc32eae9
Fix build error on some compilers after recent bugfix
===================================================================
M intern/cycles/scene/shader.cpp
M intern/opencolorio/ocio_impl.cc
===================================================================
diff --git a/intern/cycles/scene/shader.cpp b/intern/cycles/scene/shader.cpp
index e6c79c5faf9..9ac7edea7e8 100644
--- a/intern/cycles/scene/shader.cpp
+++ b/intern/cycles/scene/shader.cpp
@@ -838,18 +838,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;
}
diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc
index 7c2f4017143..8b3c2dae6b0 100644
--- a/intern/opencolorio/ocio_impl.cc
+++ b/intern/opencolorio/ocio_impl.cc
@@ -341,9 +341,9 @@ void OCIOImpl::configGetXYZtoRGB(OCIO_ConstConfigRcPtr
*config_, float xyz_to_rg
if (to_scene_linear_matrix(config, "aces_interchange", aces_to_rgb)) {
/* This is the OpenColorIO builtin transform:
* UTILITY - ACES-AP0_to_CIE-XYZ-D65_BFD. */
- const float ACES_AP0_to_xyz_D65[3][3] = {{0.938280, 0.337369, 0.001174},
- {-0.004451, 0.729522,
-0.003711},
- {0.016628, -0.066890,
1.091595}};
+ const float ACES_AP0_to_xyz_D65[3][3] = {{0.938280f, 0.337369f,
0.001174f},
+ {-0.004451f, 0.729522f,
-0.003711f},
+ {0.016628f, -0.066890f,
1.091595f}};
float xyz_to_aces[3][3];
invert_m3_m3(xyz_to_aces, ACES_AP0_to_xyz_D65);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
