Fusion fix, scenefile drop fix, startup from standalone fix - v1.3.0.78

Author: RichardFrangenberg

Prism/Plugins/Apps/Fusion/Integration/3 Project Browser.py

@@ -38,14 +38,19 @@
 if not prismRoot:
  prismRoot = PRISMROOT
 
+sys.path.append(os.path.join(prismRoot, "Scripts"))
+
+if sys.version[0] == "2":
+ sys.path.append(os.path.join(prismRoot, "PythonLibs", "Python27"))
+ sys.path.append(os.path.join(prismRoot, "PythonLibs", "Python27", "PySide"))
+else:
+ sys.path.append(os.path.join(prismRoot, "PythonLibs", "Python37"))
+ sys.path.append(os.path.join(prismRoot, "PythonLibs", "Python37", "PySide"))
+
 # Fix for imageio to work
 sys.path.insert(0, os.path.join(prismRoot, "PythonLibs/CrossPlatform"))
 import imageio # nopep8
 
-sys.path.append(os.path.join(prismRoot, "Scripts"))
-sys.path.append(os.path.join(prismRoot, "PythonLibs", "Python27", "PySide"))
-sys.path.append(os.path.join(prismRoot, "PythonLibs", "Python37", "PySide"))
-
 try:
  from PySide2.QtCore import *
  from PySide2.QtGui import *
@@ -65,16 +70,16 @@
 
 doOpen = True
 try:
-if scriptlib is True and pcore.getConfig("fusion", "openprism") is False:
-doOpen = False
+ if scriptlib is True and pcore.getConfig("fusion", "openprism") is False:
+ doOpen = False
 except:
-pass
+ pass
 
 if doOpen:
-curPrj = pcore.getConfig("globals", "current project")
-if curPrj is not None and curPrj != "":
- pcore.changeProject(curPrj, openUi="projectBrowser")
-else:
- pcore.projects.setProject(openUi="projectBrowser")
+ curPrj = pcore.getConfig("globals", "current project")
+ if curPrj is not None and curPrj != "":
+  pcore.changeProject(curPrj, openUi="projectBrowser")
+ else:
+  pcore.projects.setProject(openUi="projectBrowser")
 
-qapp.exec_()
+ qapp.exec_()

Prism/Plugins/Apps/Houdini/Scripts/Prism_Houdini_Functions.py

@@ -81,9 +81,16 @@ def __init__(self, core, plugin):
  ".otlnc",
  ".otllc",
  ]
+ self.whiteListedExternalFiles = [
+ {
+ "nodeType": "topnet",
+ "parmName": "taskgraphfile",
+ },
+ ]
  self.ropLocation = "/out"
  self.filecache = Prism_Houdini_Node_Filecache.Prism_Houdini_Filecache(self.plugin)
  self.importFile = Prism_Houdini_Node_ImportFile.Prism_Houdini_ImportFile(self.plugin)
+ self.nodeTypeAPIs = [self.filecache, self.importFile]
  self.callbacks = []
  self.registerCallbacks()
 
@@ -812,7 +819,8 @@ def setNodeParm(self, node, parm, val=None, clear=False, severity="warning"):
 
  if val is not None:
  node.parm(parm).set(val)
- except:
+ except Exception as e:
+ logger.debug(str(e))
  if not node.parm(parm):
  msg = "parm doesn't exist: \"%s\" on node \"%s\"" % (parm, node.path())
  if severity == "warning":
@@ -1106,12 +1114,16 @@ def sm_getExternalFiles(self, origin):
  ]:
  continue
 
- if (
- x[0] is not None
- and x[0].name() in ["taskgraphfile"]
- and x[0].node().type().name()
- in ["topnet"]
- ):
+ doContinue = False
+ for whiteListed in self.whiteListedExternalFiles:
+ if (
+ x[0] and x[0].name() == whiteListed["parmName"]
+ and x[0].node().type().name() == whiteListed["nodeType"]
+ ):
+ doContinue = True
+ break
+
+ if doContinue:
  continue
 
  if (
@@ -1553,10 +1565,10 @@ def onNodeDeleted(self, kwargs):
  return
 
  state = self.getStateFromNode(kwargs)
- if kwargs["node"].type().name().startswith(self.importFile.getTypeName()):
-  parent = self.importFile.getParentFolder(create=False, node=kwargs["node"])
- elif kwargs["node"].type().name().startswith(self.filecache.getTypeName()):
- parent = self.filecache.getParentFolder(create=False)
+ parent = None
+ for api in self.nodeTypeAPIs:
+  if kwargs["node"].type().name().startswith(api.getTypeName()):
+  parent = api.getParentFolder(create=False, node=kwargs["node"])
 
  sm = self.core.getStateManager()
  sm.deleteState(state, silent=True)
@@ -1572,16 +1584,14 @@ def onNodeDeleted(self, kwargs):
  def createStateForNode(self, kwargs):
  sm = self.core.getStateManager()
 
- if kwargs["node"].type().name().startswith(self.importFile.getTypeName()):
- parent = self.importFile.getParentFolder(node=kwargs["node"])
- if parent:
- parentExpanded = parent.isExpanded()
- state = sm.createState("ImportFile", node=kwargs["node"], setActive=True, openProductsBrowser=False, parent=parent)
- elif kwargs["node"].type().name().startswith(self.filecache.getTypeName()):
- parent = self.filecache.getParentFolder()
- if parent:
- parentExpanded = parent.isExpanded()
- state = sm.createState("Export", node=kwargs["node"], setActive=True, parent=parent)
+ for api in self.nodeTypeAPIs:
+ if kwargs["node"].type().name().startswith(api.getTypeName()):
+ parent = api.getParentFolder(create=False, node=kwargs["node"])
+ if parent:
+ parentExpanded = parent.isExpanded()
+
+ openBrowser = False if api.listType == "Import" else None
+ state = sm.createState(api.stateType, node=kwargs["node"], setActive=True, openProductsBrowser=openBrowser, parent=parent)
 
  if parent:
  parent.setExpanded(parentExpanded)

Prism/Plugins/Apps/Houdini/Scripts/Prism_Houdini_Node_Filecache.py

@@ -55,6 +55,8 @@ def __init__(self, plugin):
  self.initState = None
  self.executeBackground = False
  self.nodeExecuted = False
+ self.stateType = "Export"
+ self.listType = "Export"
 
  @err_catcher(name=__name__)
  def getTypeName(self):
@@ -305,7 +307,7 @@ def updateLatestVersion(self, node):
  node.parm("readVersion").set(latestVersion)
 
  @err_catcher(name=__name__)
- def getParentFolder(self, create=True):
+ def getParentFolder(self, create=True, node=None):
  sm = self.core.getStateManager()
  for state in sm.states:
  if state.ui.listType != "Export" or state.ui.className != "Folder":

Prism/Plugins/Apps/Houdini/Scripts/Prism_Houdini_Node_ImportFile.py

@@ -53,6 +53,8 @@ class Prism_Houdini_ImportFile(object):
  def __init__(self, plugin):
  self.plugin = plugin
  self.core = self.plugin.core
+ self.stateType = "ImportFile"
+ self.listType = "Import"
 
  @err_catcher(name=__name__)
  def getTypeName(self):

Prism/Plugins/Apps/Houdini/Scripts/StateManagerNodes/hou_ImageRender.py

@@ -176,8 +176,7 @@ def setup(
  fileName = self.core.getCurrentFileName()
  fnameData = self.core.getScenefileData(fileName)
  if fnameData.get("category"):
- self.l_taskName.setText(fnameData.get("category"))
- self.b_changeTask.setStyleSheet("")
+ self.setTaskname(fnameData.get("category"))
 
  self.updateUi()
 
@@ -204,9 +203,7 @@ def loadData(self, data):
  if "statename" in data:
  self.e_name.setText(data["statename"])
  if "taskname" in data:
- self.l_taskName.setText(data["taskname"])
- if data["taskname"] != "":
- self.b_changeTask.setStyleSheet("")
+ self.setTaskname(data["taskname"])
  if "renderpresetoverride" in data:
  res = eval(data["renderpresetoverride"])
  self.chb_renderPreset.setChecked(res)
@@ -579,13 +576,57 @@ def changeTask(self):
  result = self.nameWin.exec_()
 
  if result == 1:
- self.l_taskName.setText(self.nameWin.e_item.text())
+ self.setTaskname(self.nameWin.e_item.text())
  self.nameChanged(self.e_name.text())
 
  self.b_changeTask.setStyleSheet("")
 
  self.stateManager.saveStatesToScene()
 
+ @err_catcher(name=__name__)
+ def setTaskname(self, taskname):
+ self.l_taskName.setText(taskname)
+ self.nameChanged(self.e_name.text())
+ if taskname:
+ self.b_changeTask.setStyleSheet("")
+ else:
+ self.b_changeTask.setStyleSheet(
+ "QPushButton { background-color: rgb(150,0,0); border: none;}"
+ )
+ self.stateManager.saveStatesToScene()
+
+ @err_catcher(name=__name__)
+ def getTaskname(self):
+ taskName = self.l_taskName.text()
+ return taskName
+
+ @err_catcher(name=__name__)
+ def getRangeType(self):
+ return self.cb_rangeType.currentText()
+
+ @err_catcher(name=__name__)
+ def setRangeType(self, rangeType):
+ idx = self.cb_rangeType.findText(rangeType)
+ if idx != -1:
+ self.cb_rangeType.setCurrentIndex(idx)
+ self.updateRange()
+ return True
+
+ return False
+
+ @err_catcher(name=__name__)
+ def getLocation(self):
+ return self.cb_outPath.currentText()
+
+ @err_catcher(name=__name__)
+ def setLocation(self, location):
+ idx = self.cb_outPath.findText(location)
+ if idx != -1:
+ self.cb_outPath.setCurrentIndex(idx)
+ return True
+
+ return False
+
  @err_catcher(name=__name__)
  def presetOverrideChanged(self, checked):
  self.cb_renderPreset.setEnabled(checked)
@@ -642,7 +683,6 @@ def setCamResolution(self):
  self.core.popup(msg, title=title)
  return
 
-
  self.sp_resWidth.setValue(self.curCam.parm("resx").eval())
  self.sp_resHeight.setValue(self.curCam.parm("resy").eval())
 
@@ -1183,16 +1223,22 @@ def executeState(self, parent, useVersion="next"):
 
  try:
  for frameChunk in frameChunks:
- if not self.core.appPlugin.setNodeParm(self.node, "f1", clear=True):
- return [self.state.text(0) + ": error - Publish canceled"]
- if not self.core.appPlugin.setNodeParm(self.node, "f2", clear=True):
- return [self.state.text(0) + ": error - Publish canceled"]
+ isStart = self.node.parm("f1").eval() == frameChunk[0]
+ isEnd = self.node.parm("f2").eval() == frameChunk[1]
 
- if not self.core.appPlugin.setNodeParm(self.node, "f1", val=frameChunk[0]):
- return [self.state.text(0) + ": error - Publish canceled"]
+ if not isStart:
+ if not self.core.appPlugin.setNodeParm(self.node, "f1", clear=True):
+ return [self.state.text(0) + ": error - Publish canceled"]
 
- if not self.core.appPlugin.setNodeParm(self.node, "f2", val=frameChunk[1]):
- return [self.state.text(0) + ": error - Publish canceled"]
+ if not self.core.appPlugin.setNodeParm(self.node, "f1", val=frameChunk[0]):
+ return [self.state.text(0) + ": error - Publish canceled"]
+
+ if not isEnd:
+ if not self.core.appPlugin.setNodeParm(self.node, "f2", clear=True):
+ return [self.state.text(0) + ": error - Publish canceled"]
+
+ if not self.core.appPlugin.setNodeParm(self.node, "f2", val=frameChunk[1]):
+ return [self.state.text(0) + ": error - Publish canceled"]
 
  result = self.curRenderer.executeRender(self)
  if not result:

Prism/Scripts/PrismCore.py

@@ -183,7 +183,7 @@ def __init__(self, app="Standalone", prismArgs=[]):
 
  try:
  # set some general variables
- self.version = "v1.3.0.77"
+ self.version = "v1.3.0.78"
  self.requiredLibraries = "v1.3.0.0"
  self.core = self
 

Prism/Scripts/PrismUtils/Decorators.py

@@ -58,9 +58,16 @@ def func_wrapper(*args, **kwargs):
  except Exception as e:
  exc_type, exc_obj, exc_tb = sys.exc_info()
 
+ if hasattr(args[0], "core"):
+ core = args[0].core
+ else:
+ core = None
+ logger.warning("class has no core")
+
  versionStr = ""
- versionStr += "\nCore: %s" % args[0].core.version
- if getattr(args[0].core, "appPlugin", None):
+ if core:
+ versionStr += "\nCore: %s" % core.version
+ if core and getattr(args[0].core, "appPlugin", None):
  versionStr += "\nApp plugin: %s %s" % (args[0].core.appPlugin.pluginName, args[0].core.appPlugin.version)
  if plugin:
  versionStr += "\nPlugin: %s %s" % (args[0].plugin.pluginName, args[0].plugin.version)
@@ -73,6 +80,9 @@ def func_wrapper(*args, **kwargs):
  traceback.format_exc(),
  )
 
+ if not core:
+ raise Exception(erStr)
+
  ltime = getattr(args[0].core, "lastErrorTime", 0)
  if (time.time() - ltime) > 1:
  isGuiThread = QApplication.instance().thread() == QThread.currentThread()

Prism/Scripts/PrismUtils/PathManager.py

@@ -634,7 +634,7 @@ def getFrameFromFilename(self, filename):
 
  @err_catcher(name=__name__)
  def getLocationFromPath(self, path):
- if path.startswith(self.core.projectPath):
+ if path.startswith(getattr(self.core, "projectPath", "")):
  return "global"
  elif self.core.useLocalFiles and path.startswith(self.core.localProjectPath):
  return "local"

Prism/Scripts/ProjectScripts/ProjectBrowser.py

@@ -4811,7 +4811,8 @@ def ingestScenefiles(self, entityType, files):
  for file in files:
  kwargs["extension"] = os.path.splitext(file)[1]
  targetPath = self.core.paths.generateScenePath(**kwargs)
- targetPath = self.core.convertPath(targetPath, target="local")
+ if self.core.useLocalFiles:
+ targetPath = self.core.convertPath(targetPath, target="local")
 
  if not os.path.exists(os.path.dirname(targetPath)):
  try:

changelog.txt

@@ -1,3 +1,8 @@
+v1.3.0.78:
+- fixed an error dropping files in the scenefiles list in the Project Browser in some cases
+- fixed an error when opening Blender scenes from the standalone Project Browser
+- fixed an error that the Project Browser in Fusion didn't open in some cases
+
 v1.3.0.77:
 - updated Fusion integration including location option on WritePrism node and option to "Solo" a write node (Thanks to EmberLightVFX)
 - fixed a bug that the local project path dialog could open in some cases when Prism was executed in commandline mode (like on Deadline)