Skip to content

Commit

Permalink
Merge pull request #101 from ynput/feature/OP-7700_OpenRV-AYON-Addon
Browse files Browse the repository at this point in the history
OpenRV: adding Applications
  • Loading branch information
kalisp authored Feb 28, 2024
2 parents 8bf8649 + 27eef74 commit 7356863
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 2 deletions.
3 changes: 2 additions & 1 deletion client/ayon_core/hooks/pre_add_last_workfile_arg.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook):
"tvpaint",
"substancepainter",
"aftereffects",
"wrap"
"wrap",
"openrv"
}
launch_types = {LaunchTypes.local}

Expand Down
1 change: 1 addition & 0 deletions client/ayon_core/hooks/pre_ocio_hook.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class OCIOEnvHook(PreLaunchHook):
"nuke",
"hiero",
"resolve",
"openrv"
}
launch_types = set()

Expand Down
Binary file added client/ayon_core/resources/app_icons/openrv.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions server_addon/applications/server/applications.json
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,30 @@
}
]
},
"openrv": {
"enabled": true,
"label": "OpenRV",
"icon": "{}/app_icons/openrv.png",
"host_name": "openrv",
"environment": "{\n \n}",
"variants": [
{
"name": "1.0.0",
"use_python_2": false,
"executables": {
"windows": [],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": "{\n \n}"
}
]
},
"additional_apps": []
}
}
2 changes: 2 additions & 0 deletions server_addon/applications/server/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ class ApplicationsSettings(BaseSettingsModel):
default_factory=AppGroupWithPython, title="Unreal Editor")
wrap: AppGroup = SettingsField(
default_factory=AppGroupWithPython, title="Wrap")
openrv: AppGroup = SettingsField(
default_factory=AppGroupWithPython, title="OpenRV")
additional_apps: list[AdditionalAppGroup] = SettingsField(
default_factory=list, title="Additional Applications")

Expand Down
2 changes: 1 addition & 1 deletion server_addon/applications/server/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.1.5"
__version__ = "0.1.6"

0 comments on commit 7356863

Please sign in to comment.