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:
authorClément Foucault <foucault.clem@gmail.com>2022-02-22 19:29:05 +0300
committerClément Foucault <foucault.clem@gmail.com>2022-02-22 19:29:32 +0300
commit2f951667c0b95f1c3d9c9ab1fe0f74becd80c78b (patch)
tree7c86e910612ab9b43273673aedadc33b3931d1a3 /intern/opencolorio
parent8073c95fe9d47bc42ba390f61da35062ffd6398a (diff)
OCIO: Fix bool1 vs. bool comparison warning.
Fixes the following warning: `'!=': unsafe mix of type 'bool1' and type 'bool' in operation`
Diffstat (limited to 'intern/opencolorio')
-rw-r--r--intern/opencolorio/ocio_impl_glsl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc
index 47c965dbc8e..c5b0c597abd 100644
--- a/intern/opencolorio/ocio_impl_glsl.cc
+++ b/intern/opencolorio/ocio_impl_glsl.cc
@@ -506,11 +506,11 @@ static void updateGPUDisplayParameters(OCIO_GPUShader &shader,
data.dither = dither;
do_update = true;
}
- if (data.use_predivide != use_predivide) {
+ if (bool(data.use_predivide) != use_predivide) {
data.use_predivide = use_predivide;
do_update = true;
}
- if (data.use_overlay != use_overlay) {
+ if (bool(data.use_overlay) != use_overlay) {
data.use_overlay = use_overlay;
do_update = true;
}