diff options
| -rw-r--r-- | intern/opencolorio/ocio_impl_glsl.cc | 5 | ||||
| -rw-r--r-- | release/datafiles/colormanagement/config.ocio | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc index dc82e60d66a..54be1e0f339 100644 --- a/intern/opencolorio/ocio_impl_glsl.cc +++ b/intern/opencolorio/ocio_impl_glsl.cc @@ -51,8 +51,7 @@ using namespace OCIO_NAMESPACE; #include "ocio_impl.h" -static const int LUT3D_EDGE_SIZE = 32; - +static const int LUT3D_EDGE_SIZE = 64; /* **** OpenGL drawing routines using GLSL for color space transform ***** */ @@ -97,7 +96,7 @@ static const char *g_fragShaderText = "" " col[0] *= inv_alpha;\n" " col[1] *= inv_alpha;\n" " col[2] *= inv_alpha;\n" -"}\n" +" }\n" " gl_FragColor = OCIODisplay(col, tex2);\n" "\n" "}\n"; diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio index 5cc073fe76c..1e78c8945c0 100644 --- a/release/datafiles/colormanagement/config.ocio +++ b/release/datafiles/colormanagement/config.ocio @@ -171,11 +171,11 @@ colorspaces: equalitygroup: bitdepth: 32f isdata: false - allocation: uniform - allocationvars: [0, 1] + allocation: lg2 + allocationvars: [-8.5, 5] from_reference: !<GroupTransform> children: - - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: nearest} + - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: linear} - !<FileTransform> {src: aces_to_xyz.spimtx, interpolation: linear} - !<ColorSpace> |