Fusion 16 support - v1.3.0.43

PrismPipeline · Oct 27, 2020 · 200cc38 · 200cc38
1 parent 79d22c8
commit 200cc38
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 26 deletions.
diff --git a/Documentation/index/feature_reference.rst b/Documentation/index/feature_reference.rst
@@ -25,17 +25,6 @@ Follow the installer instructions:
 
 After the files are extracted, an additional :ref:`installation dialog<dlgInstallation>` opens.
 
-Prism requires Microsoft Visual C++ to be installed to launch properly. For the latest Prism version Microsoft Visual C++ 2015 is needed, but for older Prism versions you may require 2010 or 2013.
-These are already installed on most computers, but if you see an error related to MSVCR1.dll, MSVCR120.dll or if Prism doesn't start after the installation, then you need to install these manually.
-
-You can download the installer from the microsoft website:
-
-`Microsoft Visual C++ 2010 Redistributable <https://www.microsoft.com/en-us/download/details.aspx?id=26999>`_
-
-`Microsoft Visual C++ 2013 Redistributable <https://support.microsoft.com/en-us/help/3179560/update-for-visual-c-2013-and-visual-c-redistributable-package>`_
-
-`Microsoft Visual C++ 2015 Redistributable (vc_redist.x64.exe) <https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads>`_
-
 Prism will be installed into this location by default, but you can change the location during the installation:
 
 C:/Prism/*

diff --git a/Documentation/index/overview.rst b/Documentation/index/overview.rst
@@ -26,12 +26,12 @@ In the list below you can see, which DCC integrations are available on which OS
 Integration     Windows   Linux   Mac OSX    Supported Versions
 ------------  ----------  ------  --------   --------------------------------------------
 ============  ==========  ======  ========   ============================================
-3dsMax             X                           2017-2019
-Blender            X                           2.79-2.80
-Fusion             X                           9.02
-Houdini            X        X        X         16.0-17.5
-Maya               X        X        X         2016-2019 (earlier versions untested)
-Natron             X        X                  2.13-2.14  (earlier versions untested)
+3dsMax             X                           2017-2021 (with Python 2.7)
+Blender            X        X                  2.79-2.90
+Fusion             X                           9.02-16
+Houdini            X        X        X         16.0-18.5
+Maya               X        X        X         2016-2020 (earlier versions untested)
+Natron             X        X                  2.13-2.15  (earlier versions untested)
 Nuke               X        X        X         >10.0 (earlier versions unstable)
 Photoshop          X                 X         CS6, CC (earlier versions untested)
 Standalone         X        X        X

diff --git a/Prism/Plugins/ProjectManagers/Shotgun/Scripts/Prism_Shotgun_Functions.py b/Prism/Plugins/ProjectManagers/Shotgun/Scripts/Prism_Shotgun_Functions.py
@@ -277,7 +277,8 @@ def assetCreated(self, origin, itemDlg, assetPath):
 
     @err_catcher(name=__name__)
     def editShot_open(self, origin, shotName):
-        if shotName is None:
+        shotName, seqName = self.core.entities.splitShotname(shotName)
+        if not shotName:
             sg = self.core.getConfig("shotgun", "active", configPath=self.core.prismIni)
             if not sg:
                 return

diff --git a/Prism/Scripts/PrismCore.py b/Prism/Scripts/PrismCore.py
@@ -181,7 +181,7 @@ def __init__(self, app="Standalone", prismArgs=[]):
 
         try:
             # set some general variables
-            self.version = "v1.3.0.42"
+            self.version = "v1.3.0.43"
             self.requiredLibraries = "v1.3.0.0"
             self.core = self
 

diff --git a/Prism/Scripts/ProjectScripts/EditShot.py b/Prism/Scripts/ProjectScripts/EditShot.py
@@ -70,9 +70,6 @@ def __init__(self, core, shotName, sequences, editSequence=False):
         self.editSequence = editSequence
         self.core.parentWindow(self)
 
-        if self.shotName == "no sequence":
-            self.shotName = None
-
         if len(self.sequences) == 0:
             self.b_showSeq.setVisible(False)
 

diff --git a/Prism/Scripts/ProjectScripts/ProjectBrowser.py b/Prism/Scripts/ProjectScripts/ProjectBrowser.py
@@ -971,7 +971,7 @@ def mousedb(self, event, tab, uielement):
             if (
                 shotName
                 and len(shotName) == 2
-                and shotName[1]
+                and shotName[0]
                 and self.lw_sPipeline.indexAt(event.pos()).data() == None
             ):
                 self.createStepWindow("s")
@@ -1445,10 +1445,15 @@ def rclCat(self, tab, pos):
 
         elif tab == "sp":
             lw = self.lw_sPipeline
-            if self.cursShots is not None:
-                path = self.core.getEntityPath(entity="step", shot=self.cursShots)
-            else:
+            shotName = self.core.entities.splitShotname(self.cursShots)
+            if not (
+                shotName
+                and len(shotName) == 2
+                and shotName[0]
+            ):
                 return False
+
+            path = self.core.getEntityPath(entity="step", shot=self.cursShots)
             typename = "Step"
             callbackName = "openPBShotStepContextMenu"
 

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+v1.3.0.43:
+- added support for Fusion 16 (thanks to EmberLightVFX)
+- fixed a bug that steps could be created when a sequence was selected in the Project Browser
+- fixed a bug in the Shotgun plugin that the "Create shot in Shotgun" checkbox was not visible in the "Create Shot dialog"
+
 v1.3.0.42:
 - removed a limitation that "Send to dailies" didn't work in Python 2, which includes most DCCs
 - fixed a wrong behavior when pressing the "next" button in the "Create Shot" dialog when the shot already existed