projects
/
OpenColorIO-Configs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated aliases to handle cases where main colorspaces are renamed with the family...
[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
7316a53
..
00f071c
100644
(file)
--- a/
aces_1.0.0/python/aces_ocio/colorspaces/aces.py
+++ b/
aces_1.0.0/python/aces_ocio/colorspaces/aces.py
@@
-125,7
+125,7
@@
def create_ACEScc(aces_ctl_directory,
cs = ColorSpace(name)
cs.description = 'The %s color space' % name
cs = ColorSpace(name)
cs.description = 'The %s color space' % name
- cs.aliases = ["acescc_ap1"]
+ cs.aliases = ["acescc
", "acescc
_ap1"]
cs.equality_group = ''
cs.family = 'ACES'
cs.is_data = False
cs.equality_group = ''
cs.family = 'ACES'
cs.is_data = False
@@
-191,7
+191,7
@@
def create_ACESproxy(aces_ctl_directory,
cs = ColorSpace(name)
cs.description = 'The %s color space' % name
cs = ColorSpace(name)
cs.description = 'The %s color space' % name
- cs.aliases = ["acesproxy_ap1"]
+ cs.aliases = ["acesproxy
", "acesproxy
_ap1"]
cs.equality_group = ''
cs.family = 'ACES'
cs.is_data = False
cs.equality_group = ''
cs.family = 'ACES'
cs.is_data = False
@@
-264,7
+264,7
@@
def create_ACEScg(aces_ctl_directory,
cs = ColorSpace(name)
cs.description = 'The %s color space' % name
cs = ColorSpace(name)
cs.description = 'The %s color space' % name
- cs.aliases = ["lin_ap1"]
+ cs.aliases = ["
acescg", "
lin_ap1"]
cs.equality_group = ''
cs.family = 'ACES'
cs.is_data = False
cs.equality_group = ''
cs.family = 'ACES'
cs.is_data = False
@@
-1059,7
+1059,7
@@
def create_ODTs(aces_ctl_directory,
log2_shaper_copy_name = "Log2 Shaper"
log2_shaper_copy_colorspace = ColorSpace(log2_shaper_copy_name)
log2_shaper_copy_colorspace.description = 'The %s color space' % log2_shaper_copy_name
log2_shaper_copy_name = "Log2 Shaper"
log2_shaper_copy_colorspace = ColorSpace(log2_shaper_copy_name)
log2_shaper_copy_colorspace.description = 'The %s color space' % log2_shaper_copy_name
- log2_shaper_copy_colorspace.aliases = [compact(log2_shaper_copy_name)]
+ log2_shaper_copy_colorspace.aliases = [
"crv_%s" %
compact(log2_shaper_copy_name)]
log2_shaper_copy_colorspace.equality_group = log2_shaper_copy_name
log2_shaper_copy_colorspace.family = log2_shaper_colorspace.family
log2_shaper_copy_colorspace.is_data = log2_shaper_colorspace.is_data
log2_shaper_copy_colorspace.equality_group = log2_shaper_copy_name
log2_shaper_copy_colorspace.family = log2_shaper_colorspace.family
log2_shaper_copy_colorspace.is_data = log2_shaper_colorspace.is_data
@@
-1096,7
+1096,7
@@
def create_ODTs(aces_ctl_directory,
shaper_api1_name = "%s - AP1" % shaper_name
shaper_api1_colorspace = ColorSpace(shaper_api1_name)
shaper_api1_colorspace.description = 'The %s color space' % shaper_api1_name
shaper_api1_name = "%s - AP1" % shaper_name
shaper_api1_colorspace = ColorSpace(shaper_api1_name)
shaper_api1_colorspace.description = 'The %s color space' % shaper_api1_name
- shaper_api1_colorspace.aliases = ["%s_ap1" % compact(shaper_
api1_
name)]
+ shaper_api1_colorspace.aliases = ["%s_ap1" % compact(shaper_name)]
shaper_api1_colorspace.equality_group = shaper_api1_name
shaper_api1_colorspace.family = log2_shaper_colorspace.family
shaper_api1_colorspace.is_data = log2_shaper_colorspace.is_data
shaper_api1_colorspace.equality_group = shaper_api1_name
shaper_api1_colorspace.family = log2_shaper_colorspace.family
shaper_api1_colorspace.is_data = log2_shaper_colorspace.is_data
@@
-1514,6
+1514,9
@@
def create_colorspaces(aces_ctl_directory,
ACEScc)
colorspaces.extend(odts)
ACEScc)
colorspaces.extend(odts)
+ # Wish there was an automatic way to get this from the CTL
+ defaultDisplay = "sRGB (D60 sim.)"
+
roles = {'color_picking': ACEScg.name,
'color_timing': ACEScc.name,
'compositing_log': ACEScc.name,
roles = {'color_picking': ACEScg.name,
'color_timing': ACEScc.name,
'compositing_log': ACEScc.name,
@@
-1521,7
+1524,7
@@
def create_colorspaces(aces_ctl_directory,
'default': ACES.name,
'matte_paint': ACEScc.name,
'reference': '',
'default': ACES.name,
'matte_paint': ACEScc.name,
'reference': '',
- 'scene_linear': ACES.name,
+ 'scene_linear': ACES
cg
.name,
'texture_paint': ''}
'texture_paint': ''}
- return ACES, colorspaces, displays, ACEScc, roles
+ return ACES, colorspaces, displays, ACEScc, roles
, defaultDisplay