Fixed case mismatch in reference to CTL file. Allows build on Linux.

[OpenColorIO-Configs.git] / aces_1.0.0 / python / aces_ocio / colorspaces / aces.py

diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py
index 33627b8..3b34319 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py
@@ -16,7 +16,7 @@ import shutil
 
 import PyOpenColorIO as ocio
 
-from aces_ocio.lut import (
+from aces_ocio.generate_lut import (
     generate_1d_LUT_from_CTL,
     generate_3d_LUT_from_CTL,
     write_SPI_1d)
@@ -614,7 +614,7 @@ def create_Dolby_PQ_scaled(aces_ctl_directory,
     ctls = [os.path.join(
         aces_ctl_directory,
         'utilities',
-        'ACESlib.DolbyPQ_to_lin_param.a1.0.0.ctl')]
+        'ACESlib.OCIOshaper_to_lin_param.a1.0.0.ctl')]
     lut = '%s_to_linear.spi1d' % name
 
     lut = sanitize(lut)
@@ -737,8 +737,7 @@ def create_ACES_LMT(lmt_name,
         ctls = [os.path.join(aces_ctl_directory,
                              lmt_values['transformCTLInverse']),
                 shaper_from_aces_ctl % aces_ctl_directory]
-        # TODO: Investigate unresolved `odt_name` reference.
-        lut = 'Inverse.%s.%s.spi3d' % (odt_name, shaper_name)
+        lut = 'Inverse.%s.%s.spi3d' % (lmt_name, shaper_name)
 
         lut = sanitize(lut)
 
@@ -1182,10 +1181,10 @@ def create_ODTs(aces_ctl_directory,
         dolby_pq_scaled_shaper_name,
         os.path.join('%s',
                      'utilities',
-                     'ACESlib.DolbyPQ_to_Lin_param.a1.0.0.ctl'),
+                     'ACESlib.OCIOshaper_to_Lin_param.a1.0.0.ctl'),
         os.path.join('%s',
                      'utilities',
-                     'ACESlib.Lin_to_DolbyPQ_param.a1.0.0.ctl'),
+                     'ACESlib.Lin_to_OCIOshaper_param.a1.0.0.ctl'),
         1.0,
         log2_params]
 
@@ -1200,8 +1199,8 @@ def create_ODTs(aces_ctl_directory,
     for odt in sorted_odts:
         (odt_name, odt_values) = odt
 
-        # Defining full range transform for *ODTs* that can only generate
-        # either *legal* or *full* output.
+        # Defining full range transform for *ODTs* that can generate either
+        # *legal* or *full* output.
 
         # Uncomment these lines and the lower section and
         # flip the `legalRange` value to 1 to restore the old behavior,
@@ -1547,10 +1546,11 @@ def create_colorspaces(aces_ctl_directory,
                                  ACEScc)
     colorspaces.extend(odts)
 
-    # TODO: Investigate if there is a way to retrieve the value from *CTL*.
+    # TODO: Investigate if there is a way to retrieve these values from *CTL*.
     default_display = 'sRGB (D60 sim.)'
+    color_picking = 'Rec.709'
 
-    roles = {'color_picking': ACEScg.name,
+    roles = {'color_picking': color_picking,
              'color_timing': ACEScc.name,
              'compositing_log': ACEScc.name,
              'data': '',
@@ -1558,6 +1558,8 @@ def create_colorspaces(aces_ctl_directory,
              'matte_paint': ACEScc.name,
              'reference': '',
              'scene_linear': ACEScg.name,
-             'texture_paint': ''}
+             'texture_paint': '',
+             'compositing_linear': ACEScg.name,
+             'rendering': ACEScg.name}
 
     return ACES, colorspaces, displays, ACEScc, roles, default_display