Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

using currentfile for redshift renderer

Browse source
This commit is contained in:
Kayla Man 2023-05-11 17:00:29 +08:00
parent b2e669bcbb
commit 9a6ae240e2
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openpype/hosts/max/plugins/publish/collect_render.py
View file

@ -5,7 +5,7 @@ import pyblish.api
from pymxs import runtime as rt
from openpype.pipeline import get_current_asset_name
from openpype.hosts.max.api.lib import get_max_version
from openpype.hosts.max.api.lib import get_max_version, get_current_renderer
from openpype.hosts.max.api.lib_renderproducts import RenderProducts
from openpype.client import get_last_version_by_subset_name
@ -38,7 +38,8 @@ class CollectRender(pyblish.api.InstancePlugin):
version_doc = get_last_version_by_subset_name(project_name,
instance.name,
asset_id)
renderer_class = get_current_renderer()
renderer = str(renderer_class).split(":")[0]
self.log.debug("version_doc: {0}".format(version_doc))
version_int = 1
if version_doc:
@ -59,6 +60,7 @@ class CollectRender(pyblish.api.InstancePlugin):
"source": filepath,
"expectedFiles": render_layer_files,
"plugin": "3dsmax",
"renderer": renderer,
"frameStart": context.data['frameStart'],
"frameEnd": context.data['frameEnd'],
"version": version_int,

16
openpype/modules/deadline/plugins/publish/submit_max_deadline.py
View file

@ -14,7 +14,6 @@ from openpype.pipeline import (
)
from openpype.settings import get_project_settings
from openpype.hosts.max.api.lib import (
get_current_renderer,
get_multipass_setting
)
from openpype.hosts.max.api.lib_rendersettings import RenderSettings
@ -157,6 +156,12 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
return plugin_payload
def from_published_scene(self, replace_in_path=True):
instance = self._instance
if instance.data["renderer"]== "Redshift_renderer":
file_path = self.scene_path
return file_path
def process_submission(self):
instance = self._instance
@ -185,6 +190,8 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
instance = self._instance
job_info = copy.deepcopy(self.job_info)
plugin_info = copy.deepcopy(self.plugin_info)
if instance.data["renderer"] == "Redshift_Renderer":
self.log.debug("Using Redshift...published scene wont be used..")
plugin_data = {}
project_setting = get_project_settings(
legacy_io.Session["AVALON_PROJECT"]
@ -202,7 +209,7 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
old_output_dir = os.path.dirname(expected_files[0])
output_beauty = RenderSettings().get_render_output(instance.name,
old_output_dir)
filepath = self.from_published_scene()
filepath = self.scene_path
def _clean_name(path):
return os.path.splitext(os.path.basename(path))[0]
@ -214,9 +221,7 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
output_beauty = output_beauty.replace("\\", "/")
plugin_data["RenderOutput"] = output_beauty
renderer_class = get_current_renderer()
renderer = str(renderer_class).split(":")[0]
if renderer in [
if instance.data["renderer"] in [
"ART_Renderer",
"Redshift_Renderer",
"V_Ray_6_Hotfix_3",
@ -227,6 +232,7 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
render_elem_list = RenderSettings().get_render_element()
for i, element in enumerate(render_elem_list):
element = element.replace(orig_scene, new_scene)
element = element.replace("\\", "/")
plugin_data["RenderElementOutputFilename%d" % i] = element # noqa
self.log.debug("plugin data:{}".format(plugin_data))