fix aov separator character usage

ynput · Nov 12, 2021 · 5916389 · 5916389
1 parent 75893ad
commit 5916389
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py
@@ -180,6 +180,7 @@ def __init__(self, layer, render_instance):
  self.layer = layer
  self.render_instance = render_instance
  self.multipart = False
+ self.aov_separator = render_instance.data.get("aovSeparator", "_")
 
  # Initialize
  self.layer_data = self._get_layer_data()
@@ -676,7 +677,7 @@ def get_renderer_prefix(self):
 
  """
  prefix = super(RenderProductsVray, self).get_renderer_prefix()
- prefix = "{}.<aov>".format(prefix)
+ prefix = "{}{}<aov>".format(prefix, self.aov_separator)
  return prefix
 
  def _get_layer_data(self):

diff --git a/openpype/hosts/maya/plugins/create/create_render.py b/openpype/hosts/maya/plugins/create/create_render.py
@@ -21,6 +21,7 @@
 from openpype.modules import ModulesManager
 
 from avalon.api import Session
+from avalon.api import CreatorError
 
 
 class CreateRender(plugin.Creator):
@@ -476,7 +477,21 @@ def _set_vray_settings(self, asset):
 
  # set separator
  # set it in vray menu
- cmds.optionMenuGrp("vrayRenderElementSeparator", v=self.aov_separator)
+ if cmds.optionMenuGrp("vrayRenderElementSeparator", exists=True,
+ q=True):
+ items = cmds.optionMenuGrp(
+ "vrayRenderElementSeparator", ill=True, query=True)
+
+ separators = [cmds.menuItem(i, label=True, query=True) for i in items] # noqa: E501
+ try:
+ sep_idx = separators.index(self.aov_separator)
+ except ValueError:
+ raise CreatorError(
+ "AOV character {} not in {}".format(
+ self.aov_separator, separators))
+
+ cmds.optionMenuGrp(
+ "vrayRenderElementSeparator", sl=sep_idx + 1, edit=True)
  cmds.setAttr(
  "{}.fileNameRenderElementSeparator".format(node),
  self.aov_separator,

diff --git a/openpype/hosts/maya/plugins/publish/collect_render.py b/openpype/hosts/maya/plugins/publish/collect_render.py
@@ -172,6 +172,18 @@ def process(self, context):
  if renderer.startswith("renderman"):
  renderer = "renderman"
 
+ try:
+ aov_separator = self._aov_chars[(
+ context.data["project_settings"]
+ ["create"]
+ ["CreateRender"]
+ ["aov_separator"]
+ )]
+ except KeyError:
+ aov_separator = "_"
+
+ render_instance.data["aovSeparator"] = aov_separator
+
  # return all expected files for all cameras and aovs in given
  # frame range
  layer_render_products = get_layer_render_products(

diff --git a/tools/run_mongo.ps1 b/tools/run_mongo.ps1
@@ -113,7 +113,7 @@ $port = 2707
 # path to database
 $dbpath = (Get-Item $openpype_root).parent.FullName + "\mongo_db_data"
 
-$preferred_version = "4.0"
+$preferred_version = "5.0"
 
 $mongoPath = Find-Mongo $preferred_version
 Write-Host ">>> " -NoNewLine -ForegroundColor Green