Merge branch 'master' into dev, updated to 1.3.0-beta3

Psyop · Jul 24, 2020 · 6c39fe5 · 6c39fe5
2 parents 3b47e7e + 62b1c82
commit 6c39fe5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.3.0-beta3:
+
+* Brought in fixes from 1.2.7.
+
 ### 1.3.0-beta2:
 
 * Brought in fixes from 1.2.6. 
@@ -12,6 +16,12 @@ Nuke:
 * The "Expand Wildcards" knob controls whether the wildcards are expanded or not.
   * If the wildcards are not expanded, wildcards are not used.
 
+### 1.2.7:
+
+Nuke:
+
+* Fixed issue where decryptomatte doesn't work inside groups (#127, contributed by Johannes Hezer)
+
 ### 1.2.6
 
 Nuke:

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ The goal of releasing Cryptomatte is to turn it into an ecosystem around an open
 
 Cryptomatte is licenced using the BSD 3-clause license. See [license.txt](license.txt).
 
-Version 1.3.0-beta2. See [changelog](CHANGELOG.md) for version history. 
+Version 1.3.0-beta3. See [changelog](CHANGELOG.md) for version history. 
 
 ## About Beta (1.3.0-beta1)
 

diff --git a/nuke/Cryptomatte.gizmo b/nuke/Cryptomatte.gizmo
@@ -54,7 +54,7 @@ Gizmo {
  addUserKnob {1 keyedName l "Keyed Name" t "This field is for information only." +HIDDEN}
  addUserKnob {26 "" +HIDDEN}
 
- addUserKnob {26 cryptomatteVersion l "Cryptomatte Version" T "1.3.0-beta2"}
+ addUserKnob {26 cryptomatteVersion l "Cryptomatte Version" T "1.3.0-beta3"}
  addUserKnob {22 troubleshoot l "Troubleshoot"  +STARTLINE
  t "'Force Update All' will run 'Force Update' on all Cryptomatte gizmos in the Nuke script. 'Force Update' orders the gizmos to re-configure themselves based on available metadata, Cryptomatte depth, and the matte list. This updates all aspects of thier operation, from the preview modes to the extraction expression. Usually these updates occur automatically on certain actions, such as 'keying' the image, changing layer selection, or reconnecting images. However if changes occur upstream of the gizmos that require manually invoked updates, 'Force Update' and 'Force Update All' may be used. "
  T "

diff --git a/nuke/Encryptomatte.gizmo b/nuke/Encryptomatte.gizmo
@@ -61,7 +61,7 @@ Gizmo {
 
  addUserKnob {20 Advanced}
 
- addUserKnob {26 cryptomatteVersion l "Cryptomatte Version" T "1.3.0-beta2"}
+ addUserKnob {26 cryptomatteVersion l "Cryptomatte Version" T "1.3.0-beta3"}
 }
  Input {
   inputs 0

diff --git a/nuke/cryptomatte_utilities.py b/nuke/cryptomatte_utilities.py
@@ -11,7 +11,7 @@
 import struct
 import fnmatch
 
-__version__ = "1.3.0-beta2"
+__version__ = "1.3.0-beta3"
 
 GIZMO_CHANNEL_KNOBS = [
     "in00", "in01", "in02", "in03",