Updated scene_linear to refer to ACES2065-1 as a number of tools use that to drive...

diff --git a/aces_1.0.0/config.ocio b/aces_1.0.0/config.ocio
index 65cfbd7..345fe79 100644 (file)
--- a/aces_1.0.0/config.ocio
+++ b/aces_1.0.0/config.ocio
@@ -14,7 +14,7 @@ roles:
   default: ACES2065-1
   matte_paint: ACEScc
   reference: Raw
   default: ACES2065-1
   matte_paint: ACEScc
   reference: Raw

-  scene_linear: ACEScg
+  scene_linear: ACES2065-1

   texture_paint: Raw
 
 displays:
   texture_paint: Raw
 
 displays:


@@ -212,30 +212,6 @@ colorspaces:
         - !<MatrixTransform> {matrix: [0.72286, 0.1263, 0.15084, 0, 0.11923, 0.76418, 0.11659, 0, 0.01427, 0.08213, 0.90359, 0, 0, 0, 0, 1]}
 
   - !<ColorSpace>
         - !<MatrixTransform> {matrix: [0.72286, 0.1263, 0.15084, 0, 0.11923, 0.76418, 0.11659, 0, 0.01427, 0.08213, 0.90359, 0, 0, 0, 0, 1]}
 
   - !<ColorSpace>

-    name: Output Shaper
-    family: Utility
-    equalitygroup: Output Shaper
-    bitdepth: 32f
-    description: |
-      The Output Shaper color space
-    isdata: false
-    allocation: uniform
-    allocationvars: [0, 1]
-    to_reference: !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear}
-
-  - !<ColorSpace>
-    name: crv_outputshaper
-    family: Aliases
-    equalitygroup: Output Shaper
-    bitdepth: 32f
-    description: |
-      The Output Shaper color space
-    isdata: false
-    allocation: uniform
-    allocationvars: [0, 1]
-    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Output Shaper}
-
-  - !<ColorSpace>

     name: ACES 1.0 to 0.1 emulation
     family: Look
     equalitygroup: ""
     name: ACES 1.0 to 0.1 emulation
     family: Look
     equalitygroup: ""


@@ -1100,6 +1076,33 @@ colorspaces:
     from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: V3 LogC (EI1000) - Wide Gamut}
 
   - !<ColorSpace>
     from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: V3 LogC (EI1000) - Wide Gamut}
 
   - !<ColorSpace>

+    name: V3 LogC (EI1280) - Wide Gamut
+    family: Input/ARRI
+    equalitygroup: ""
+    bitdepth: 32f
+    description: |
+      V3 LogC (EI1280) - Wide Gamut
+    isdata: false
+    allocation: uniform
+    allocationvars: [0, 1]
+    to_reference: !<GroupTransform>
+      children:
+        - !<FileTransform> {src: V3_LogC_1280_to_linear.spi1d, interpolation: linear}
+        - !<MatrixTransform> {matrix: [0.680206, 0.236137, 0.083658, 0, 0.085415, 1.01747, -0.102886, 0, 0.002057, -0.062563, 1.06051, 0, 0, 0, 0, 1]}
+
+  - !<ColorSpace>
+    name: logc3ei1280_arriwide
+    family: Aliases
+    equalitygroup: ""
+    bitdepth: 32f
+    description: |
+      V3 LogC (EI1280) - Wide Gamut
+    isdata: false
+    allocation: uniform
+    allocationvars: [0, 1]
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: V3 LogC (EI1280) - Wide Gamut}
+
+  - !<ColorSpace>

     name: ADX16
     family: ADX
     equalitygroup: ""
     name: ADX16
     family: ADX
     equalitygroup: ""


@@ -1142,31 +1145,28 @@ colorspaces:
     from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: LMT Shaper}
 
   - !<ColorSpace>
     from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: LMT Shaper}
 
   - !<ColorSpace>

-    name: V3 LogC (EI1280) - Wide Gamut
-    family: Input/ARRI
-    equalitygroup: ""
+    name: Output Shaper
+    family: Utility
+    equalitygroup: Output Shaper

     bitdepth: 32f
     description: |
     bitdepth: 32f
     description: |

-      V3 LogC (EI1280) - Wide Gamut
+      The Output Shaper color space

     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]

-    to_reference: !<GroupTransform>
-      children:
-        - !<FileTransform> {src: V3_LogC_1280_to_linear.spi1d, interpolation: linear}
-        - !<MatrixTransform> {matrix: [0.680206, 0.236137, 0.083658, 0, 0.085415, 1.01747, -0.102886, 0, 0.002057, -0.062563, 1.06051, 0, 0, 0, 0, 1]}
+    to_reference: !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear}

 
   - !<ColorSpace>
 
   - !<ColorSpace>

-    name: logc3ei1280_arriwide
+    name: crv_outputshaper

     family: Aliases
     family: Aliases

-    equalitygroup: ""
+    equalitygroup: Output Shaper

     bitdepth: 32f
     description: |
     bitdepth: 32f
     description: |

-      V3 LogC (EI1280) - Wide Gamut
+      The Output Shaper color space

     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]

-    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: V3 LogC (EI1280) - Wide Gamut}
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Output Shaper}

 
   - !<ColorSpace>
     name: V3 LogC (EI1600) - Wide Gamut
 
   - !<ColorSpace>
     name: V3 LogC (EI1600) - Wide Gamut

diff --git a/aces_1.0.0/nuke_config.ocio b/aces_1.0.0/nuke_config.ocio
index ddbbd19..6cea1e2 100644 (file)
--- a/aces_1.0.0/nuke_config.ocio
+++ b/aces_1.0.0/nuke_config.ocio
@@ -14,7 +14,7 @@ roles:
   default: ACES2065-1
   matte_paint: ACEScc
   reference: Raw
   default: ACES2065-1
   matte_paint: ACEScc
   reference: Raw

-  scene_linear: ACEScg
+  scene_linear: ACES2065-1

   texture_paint: Raw
 
 displays:
   texture_paint: Raw
 
 displays:


@@ -173,30 +173,6 @@ colorspaces:
         - !<MatrixTransform> {matrix: [0.72286, 0.1263, 0.15084, 0, 0.11923, 0.76418, 0.11659, 0, 0.01427, 0.08213, 0.90359, 0, 0, 0, 0, 1]}
 
   - !<ColorSpace>
         - !<MatrixTransform> {matrix: [0.72286, 0.1263, 0.15084, 0, 0.11923, 0.76418, 0.11659, 0, 0.01427, 0.08213, 0.90359, 0, 0, 0, 0, 1]}
 
   - !<ColorSpace>

-    name: Output Shaper
-    family: Utility
-    equalitygroup: Output Shaper
-    bitdepth: 32f
-    description: |
-      The Output Shaper color space
-    isdata: false
-    allocation: uniform
-    allocationvars: [0, 1]
-    to_reference: !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear}
-
-  - !<ColorSpace>
-    name: crv_outputshaper
-    family: Aliases
-    equalitygroup: Output Shaper
-    bitdepth: 32f
-    description: |
-      The Output Shaper color space
-    isdata: false
-    allocation: uniform
-    allocationvars: [0, 1]
-    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Output Shaper}
-
-  - !<ColorSpace>

     name: ACES 1.0 to 0.1 emulation
     family: Look
     equalitygroup: ""
     name: ACES 1.0 to 0.1 emulation
     family: Look
     equalitygroup: ""


@@ -1061,6 +1037,33 @@ colorspaces:
     from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: V3 LogC (EI1000) - Wide Gamut}
 
   - !<ColorSpace>
     from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: V3 LogC (EI1000) - Wide Gamut}
 
   - !<ColorSpace>

+    name: V3 LogC (EI1280) - Wide Gamut
+    family: Input/ARRI
+    equalitygroup: ""
+    bitdepth: 32f
+    description: |
+      V3 LogC (EI1280) - Wide Gamut
+    isdata: false
+    allocation: uniform
+    allocationvars: [0, 1]
+    to_reference: !<GroupTransform>
+      children:
+        - !<FileTransform> {src: V3_LogC_1280_to_linear.spi1d, interpolation: linear}
+        - !<MatrixTransform> {matrix: [0.680206, 0.236137, 0.083658, 0, 0.085415, 1.01747, -0.102886, 0, 0.002057, -0.062563, 1.06051, 0, 0, 0, 0, 1]}
+
+  - !<ColorSpace>
+    name: logc3ei1280_arriwide
+    family: Aliases
+    equalitygroup: ""
+    bitdepth: 32f
+    description: |
+      V3 LogC (EI1280) - Wide Gamut
+    isdata: false
+    allocation: uniform
+    allocationvars: [0, 1]
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: V3 LogC (EI1280) - Wide Gamut}
+
+  - !<ColorSpace>

     name: ADX16
     family: ADX
     equalitygroup: ""
     name: ADX16
     family: ADX
     equalitygroup: ""


@@ -1103,31 +1106,28 @@ colorspaces:
     from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: LMT Shaper}
 
   - !<ColorSpace>
     from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: LMT Shaper}
 
   - !<ColorSpace>

-    name: V3 LogC (EI1280) - Wide Gamut
-    family: Input/ARRI
-    equalitygroup: ""
+    name: Output Shaper
+    family: Utility
+    equalitygroup: Output Shaper

     bitdepth: 32f
     description: |
     bitdepth: 32f
     description: |

-      V3 LogC (EI1280) - Wide Gamut
+      The Output Shaper color space

     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]

-    to_reference: !<GroupTransform>
-      children:
-        - !<FileTransform> {src: V3_LogC_1280_to_linear.spi1d, interpolation: linear}
-        - !<MatrixTransform> {matrix: [0.680206, 0.236137, 0.083658, 0, 0.085415, 1.01747, -0.102886, 0, 0.002057, -0.062563, 1.06051, 0, 0, 0, 0, 1]}
+    to_reference: !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear}

 
   - !<ColorSpace>
 
   - !<ColorSpace>

-    name: logc3ei1280_arriwide
+    name: crv_outputshaper

     family: Aliases
     family: Aliases

-    equalitygroup: ""
+    equalitygroup: Output Shaper

     bitdepth: 32f
     description: |
     bitdepth: 32f
     description: |

-      V3 LogC (EI1280) - Wide Gamut
+      The Output Shaper color space

     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]

-    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: V3 LogC (EI1280) - Wide Gamut}
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Output Shaper}

 
   - !<ColorSpace>
     name: V3 LogC (EI1600) - Wide Gamut
 
   - !<ColorSpace>
     name: V3 LogC (EI1600) - Wide Gamut

diff --git a/aces_1.0.0/python/aces_ocio/create_aces_colorspaces.py b/aces_1.0.0/python/aces_ocio/create_aces_colorspaces.py
index 54b6708..ceb7791 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/create_aces_colorspaces.py
+++ b/aces_1.0.0/python/aces_ocio/create_aces_colorspaces.py
@@ -1495,7 +1495,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'    : ACEScg.name,
+             'scene_linear'    : ACES.name,

              'texture_paint'   : ''}
 
 
              'texture_paint'   : ''}