Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Houdini: Convert any ROP to a publishable AYON instance #2

Open
wants to merge 24 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5b7fdfd
Implement Generic ROP publish from https://github.com/ynput/ayon-core…
BigRoy Jul 2, 2024
b5d5e09
Add argument to docstring
BigRoy Jul 3, 2024
421adbf
Merge branch 'develop' into enhancement/houdini_generic_publish
MustafaJafar Jul 5, 2024
a267cd2
Merge branch 'develop' into enhancement/houdini_generic_publish
BigRoy Jul 11, 2024
d6d7e9e
Merge branches 'enhancement/houdini_generic_publish' and 'enhancement…
BigRoy Jul 11, 2024
5b6f0ec
Add publish button
BigRoy Jul 11, 2024
46da010
Add help
BigRoy Jul 11, 2024
83e70d5
Merge branch 'develop' into enhancement/houdini_generic_publish
BigRoy Jul 17, 2024
e74903e
Merge branch 'develop' into enhancement/houdini_generic_publish
MustafaJafar Aug 21, 2024
7e9bbd0
Merge branch 'develop' of https://github.com/ynput/ayon-houdini into …
BigRoy Sep 20, 2024
6934ba6
Fix refactored merge conflict, skip non local renders like "local_no_…
BigRoy Sep 20, 2024
3791df1
Do not error on existing `ayon_self_publish` parm but log a warning
BigRoy Sep 20, 2024
6126888
Cosmetics
BigRoy Sep 20, 2024
c14710c
Elaborate TODO
BigRoy Sep 20, 2024
36c65ad
Merge branch 'develop' into enhancement/houdini_generic_publish
MustafaJafar Sep 23, 2024
5e5cef2
Merge branch 'develop' of https://github.com/ynput/ayon-houdini into …
BigRoy Oct 3, 2024
930615b
Merge branch 'enhancement/houdini_generic_publish' of https://github.…
BigRoy Oct 3, 2024
db57f1e
Cosmetics
BigRoy Oct 3, 2024
21ab75e
Move logic around, so we don't need to import the plugin.
BigRoy Oct 3, 2024
adf9236
Fix 0 and 1 integer values turning into `bool` incorrectly - now only…
BigRoy Oct 3, 2024
ddcf908
Update client/ayon_houdini/api/lib.py
BigRoy Oct 4, 2024
41dfc25
Fix auto-create for LABS Karma node
BigRoy Oct 4, 2024
fae1a89
Add todo
BigRoy Oct 4, 2024
3f70401
Shush ruff linter
BigRoy Oct 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' of https://github.com/ynput/ayon-houdini into …
…enhancement/houdini_generic_publish

# Conflicts:
#	client/ayon_houdini/api/lib.py
#	client/ayon_houdini/api/plugin.py
#	client/ayon_houdini/plugins/publish/extract_rop.py
  • Loading branch information
BigRoy committed Sep 20, 2024
commit 7e9bbd0301f1c64fcc3ddf19670c5c4476a67163
12 changes: 12 additions & 0 deletions client/ayon_houdini/api/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -1425,6 +1425,18 @@ def prompt_reset_context():
dialog.deleteLater()


def start_workfile_template_builder():
from .workfile_template_builder import (
build_workfile_template
)

log.info("Starting workfile template builder...")
try:
build_workfile_template(workfile_creation_enabled=True)
except TemplateProfileNotFound:
log.warning("Template profile not found. Skipping...")


@contextmanager
def no_auto_create_publishable():
value = os.environ.get("AYON_HOUDINI_AUTOCREATE")
Expand Down
4 changes: 3 additions & 1 deletion client/ayon_houdini/api/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
read,
lsattr,
add_self_publish_button,
no_auto_create_publishable
no_auto_create_publishable,
render_rop
)
from .usd import get_ayon_entity_uri_from_representation_context


SETTINGS_CATEGORY = "houdini"
Expand Down
6 changes: 1 addition & 5 deletions client/ayon_houdini/plugins/publish/extract_rop.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ def process(self, instance: pyblish.api.Instance):
)
ext = ext.lstrip(".")

creator_attributes = instance.data.get("creator_attributes", {})
if creator_attributes.get("render_target", "local") == "local":
rop_node = hou.node(instance.data.get("instance_node"))
self.log.debug(f"Rendering {rop_node.path()} to {first_file}..")
render_rop(rop_node)
self.render_rop(instance)
self.validate_expected_frames(instance)

# In some cases representation name is not the the extension
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.