Skip to content

Commit

Permalink
Merge pull request #206 from BigRoy/bugfix/houdini_collect_fix_indent…
Browse files Browse the repository at this point in the history
…ations
  • Loading branch information
mkolar authored Mar 27, 2024
2 parents 4848d95 + 9062161 commit 88cb5ee
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 67 deletions.
34 changes: 17 additions & 17 deletions client/ayon_core/hosts/houdini/plugins/publish/collect_karma_rop.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@ def process(self, instance):
instance.data["chunkSize"] = chunk_size
self.log.debug("Chunk Size: %s" % chunk_size)

default_prefix = evalParmNoFrame(rop, "picture")
render_products = []

# Default beauty AOV
beauty_product = self.get_render_product_name(
prefix=default_prefix, suffix=None
)
render_products.append(beauty_product)

files_by_aov = {
"beauty": self.generate_expected_files(instance,
beauty_product)
}

filenames = list(render_products)
instance.data["files"] = filenames
instance.data["renderProducts"] = colorspace.ARenderProduct()
default_prefix = evalParmNoFrame(rop, "picture")
render_products = []

# Default beauty AOV
beauty_product = self.get_render_product_name(
prefix=default_prefix, suffix=None
)
render_products.append(beauty_product)

files_by_aov = {
"beauty": self.generate_expected_files(instance,
beauty_product)
}

filenames = list(render_products)
instance.data["files"] = filenames
instance.data["renderProducts"] = colorspace.ARenderProduct()

for product in render_products:
self.log.debug("Found render product: %s" % product)
Expand Down
100 changes: 50 additions & 50 deletions client/ayon_core/hosts/houdini/plugins/publish/collect_mantra_rop.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,57 +41,57 @@ def process(self, instance):
instance.data["chunkSize"] = chunk_size
self.log.debug("Chunk Size: %s" % chunk_size)

default_prefix = evalParmNoFrame(rop, "vm_picture")
render_products = []

# Store whether we are splitting the render job (export + render)
split_render = bool(rop.parm("soho_outputmode").eval())
instance.data["splitRender"] = split_render
export_prefix = None
export_products = []
if split_render:
export_prefix = evalParmNoFrame(
rop, "soho_diskfile", pad_character="0"
)
beauty_export_product = self.get_render_product_name(
prefix=export_prefix,
suffix=None)
export_products.append(beauty_export_product)
self.log.debug(
"Found export product: {}".format(beauty_export_product)
)
instance.data["ifdFile"] = beauty_export_product
instance.data["exportFiles"] = list(export_products)

# Default beauty AOV
beauty_product = self.get_render_product_name(
prefix=default_prefix, suffix=None
default_prefix = evalParmNoFrame(rop, "vm_picture")
render_products = []

# Store whether we are splitting the render job (export + render)
split_render = bool(rop.parm("soho_outputmode").eval())
instance.data["splitRender"] = split_render
export_prefix = None
export_products = []
if split_render:
export_prefix = evalParmNoFrame(
rop, "soho_diskfile", pad_character="0"
)
render_products.append(beauty_product)

files_by_aov = {
"beauty": self.generate_expected_files(instance,
beauty_product)
}

aov_numbers = rop.evalParm("vm_numaux")
if aov_numbers > 0:
# get the filenames of the AOVs
for i in range(1, aov_numbers + 1):
var = rop.evalParm("vm_variable_plane%d" % i)
if var:
aov_name = "vm_filename_plane%d" % i
aov_boolean = "vm_usefile_plane%d" % i
aov_enabled = rop.evalParm(aov_boolean)
has_aov_path = rop.evalParm(aov_name)
if has_aov_path and aov_enabled == 1:
aov_prefix = evalParmNoFrame(rop, aov_name)
aov_product = self.get_render_product_name(
prefix=aov_prefix, suffix=None
)
render_products.append(aov_product)

files_by_aov[var] = self.generate_expected_files(instance, aov_product) # noqa
beauty_export_product = self.get_render_product_name(
prefix=export_prefix,
suffix=None)
export_products.append(beauty_export_product)
self.log.debug(
"Found export product: {}".format(beauty_export_product)
)
instance.data["ifdFile"] = beauty_export_product
instance.data["exportFiles"] = list(export_products)

# Default beauty AOV
beauty_product = self.get_render_product_name(
prefix=default_prefix, suffix=None
)
render_products.append(beauty_product)

files_by_aov = {
"beauty": self.generate_expected_files(instance,
beauty_product)
}

aov_numbers = rop.evalParm("vm_numaux")
if aov_numbers > 0:
# get the filenames of the AOVs
for i in range(1, aov_numbers + 1):
var = rop.evalParm("vm_variable_plane%d" % i)
if var:
aov_name = "vm_filename_plane%d" % i
aov_boolean = "vm_usefile_plane%d" % i
aov_enabled = rop.evalParm(aov_boolean)
has_aov_path = rop.evalParm(aov_name)
if has_aov_path and aov_enabled == 1:
aov_prefix = evalParmNoFrame(rop, aov_name)
aov_product = self.get_render_product_name(
prefix=aov_prefix, suffix=None
)
render_products.append(aov_product)

files_by_aov[var] = self.generate_expected_files(instance, aov_product) # noqa

for product in render_products:
self.log.debug("Found render product: %s" % product)
Expand Down

0 comments on commit 88cb5ee

Please sign in to comment.