From: Haarm-Pieter Duiker <hpd1@duikerresearch.com>
Date: Mon, 3 Aug 2015 21:37:43 +0000 (-0700)
Subject: Update to properly source file names from ACES 'hotfixes' fork
X-Git-Url: http://users.mur.at/ms/git/gitweb/?p=OpenColorIO-Configs.git;a=commitdiff_plain;h=81189424cead6b262b3da1973b7d2f39e8517fae

Update to properly source file names from ACES 'hotfixes' fork
---

diff --git a/aces_1.0.0/README.md b/aces_1.0.0/README.md
index 5aa9cd6..30aae87 100644
--- a/aces_1.0.0/README.md
+++ b/aces_1.0.0/README.md
@@ -221,10 +221,13 @@ Features exposed for customization by the user include:
 - Two modes of creating the list of OCIO Displays and Views
 
 ### CTL Source
-The configuration depends on the **'hotfixes' fork of the 1.0 ACES CTL** that is available here:
+The configuration depends on the **'hotfixes' fork of the 1.0 ACES CTL**. The fork contains a number of minor bug fixes and small additions in the utilities folder but is otherwise the same as the master ACES 1.0 release. 
+
+The fork is available here:
 
 - https://github.com/ampas/aces-dev/tree/hotfixes/transforms/ctl
-- The fork contains a number of minor bug fixes and small additions in the utilities folder but is otherwise the same as the master ACES 1.0 release.
+- Clone this repo using the following command
+	- git clone --branch hotfixes https://github.com/ampas/aces-dev.git
 
 
 Dependencies
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 4f8839d..e011eaa 100644
--- a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py
@@ -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)
@@ -1181,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]
 
diff --git a/aces_1.0.0/python/aces_ocio/generate_config.py b/aces_1.0.0/python/aces_ocio/generate_config.py
index 94c6811..f16cd29 100755
--- a/aces_1.0.0/python/aces_ocio/generate_config.py
+++ b/aces_1.0.0/python/aces_ocio/generate_config.py
@@ -611,7 +611,8 @@ def create_config(config_data,
 
     print('Adding regular colorspaces')
 
-    for colorspace in sorted(config_data['colorSpaces']):
+    for colorspace in sorted(config_data['colorSpaces'],
+        cmp=lambda x,y: cmp(x.family.lower(), y.family.lower())):
         # Adding the colorspace *Family* into the name which helps with
         # applications that presenting colorspaces as one a flat list.
         if prefix: