Skip to content

Commit 8118942

Browse files
committed
Update to properly source file names from ACES 'hotfixes' fork
1 parent 7d36b2a commit 8118942

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

aces_1.0.0/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,13 @@ Features exposed for customization by the user include:
221221
- Two modes of creating the list of OCIO Displays and Views
222222

223223
### CTL Source
224-
The configuration depends on the **'hotfixes' fork of the 1.0 ACES CTL** that is available here:
224+
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.
225+
226+
The fork is available here:
225227

226228
- https://github.com/ampas/aces-dev/tree/hotfixes/transforms/ctl
227-
- 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.
229+
- Clone this repo using the following command
230+
- git clone --branch hotfixes https://github.com/ampas/aces-dev.git
228231

229232

230233
Dependencies

aces_1.0.0/python/aces_ocio/colorspaces/aces.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ def create_Dolby_PQ_scaled(aces_ctl_directory,
614614
ctls = [os.path.join(
615615
aces_ctl_directory,
616616
'utilities',
617-
'ACESlib.DolbyPQ_to_lin_param.a1.0.0.ctl')]
617+
'ACESlib.OCIOShaper_to_lin_param.a1.0.0.ctl')]
618618
lut = '%s_to_linear.spi1d' % name
619619

620620
lut = sanitize(lut)
@@ -1181,10 +1181,10 @@ def create_ODTs(aces_ctl_directory,
11811181
dolby_pq_scaled_shaper_name,
11821182
os.path.join('%s',
11831183
'utilities',
1184-
'ACESlib.DolbyPQ_to_Lin_param.a1.0.0.ctl'),
1184+
'ACESlib.OCIOShaper_to_Lin_param.a1.0.0.ctl'),
11851185
os.path.join('%s',
11861186
'utilities',
1187-
'ACESlib.Lin_to_DolbyPQ_param.a1.0.0.ctl'),
1187+
'ACESlib.Lin_to_OCIOShaper_param.a1.0.0.ctl'),
11881188
1.0,
11891189
log2_params]
11901190

aces_1.0.0/python/aces_ocio/generate_config.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,8 @@ def create_config(config_data,
611611

612612
print('Adding regular colorspaces')
613613

614-
for colorspace in sorted(config_data['colorSpaces']):
614+
for colorspace in sorted(config_data['colorSpaces'],
615+
cmp=lambda x,y: cmp(x.family.lower(), y.family.lower())):
615616
# Adding the colorspace *Family* into the name which helps with
616617
# applications that presenting colorspaces as one a flat list.
617618
if prefix:

0 commit comments

Comments
 (0)