Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into enhancement/twea…
Browse files Browse the repository at this point in the history
…k_logging

# Conflicts:
#	openpype/plugins/publish/extract_hierarchy_to_ayon.py
  • Loading branch information
BigRoy committed Sep 5, 2023
2 parents 564cb31 + 8aee7d0 commit d36b2f1
Show file tree
Hide file tree
Showing 99 changed files with 1,385 additions and 1,295 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ body:
label: Version
description: What version are you running? Look to OpenPype Tray
options:
- 3.16.5-nightly.4
- 3.16.5-nightly.3
- 3.16.5-nightly.2
- 3.16.5-nightly.1
Expand Down Expand Up @@ -134,7 +135,6 @@ body:
- 3.14.9-nightly.1
- 3.14.8
- 3.14.8-nightly.4
- 3.14.8-nightly.3
validations:
required: true
- type: dropdown
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ development tools like [CMake](https://cmake.org/) and [Visual Studio](https://v

#### Clone repository:
```sh
git clone --recurse-submodules [email protected]:Pypeclub/OpenPype.git
git clone --recurse-submodules [email protected]:ynput/OpenPype.git
```

#### To build OpenPype:
Expand Down
3 changes: 3 additions & 0 deletions openpype/hooks/pre_ocio_hook.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ def execute(self):
if config_data:
ocio_path = config_data["path"]

if self.host_name in ["nuke", "hiero"]:
ocio_path = ocio_path.replace("\\", "/")

self.log.info(
f"Setting OCIO environment to config path: {ocio_path}")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def remove_instances(self, instances):
api.get_stub().rename_item(comp_id,
new_comp_name)

def apply_settings(self, project_settings, system_settings):
def apply_settings(self, project_settings):
plugin_settings = (
project_settings["aftereffects"]["create"]["RenderCreator"]
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ def get_instances(self, context):
fam = "render.farm"
if fam not in instance.families:
instance.families.append(fam)
instance.toBeRenderedOn = "deadline"
instance.renderer = "aerender"
instance.farm = True # to skip integrate
if "review" in instance.families:
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

200 changes: 0 additions & 200 deletions openpype/hosts/fusion/deploy/Scripts/Comp/OpenPype/switch_ui.py

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion openpype/hosts/fusion/deploy/fusion_shared.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Global = {
Map = {
["OpenPype:"] = "$(OPENPYPE_FUSION)/deploy",
["Config:"] = "UserPaths:Config;OpenPype:Config",
["Scripts:"] = "UserPaths:Scripts;Reactor:System/Scripts;OpenPype:Scripts",
["Scripts:"] = "UserPaths:Scripts;Reactor:System/Scripts",
},
},
Script = {
Expand Down
10 changes: 1 addition & 9 deletions openpype/hosts/fusion/plugins/create/create_saver.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ class CreateSaver(NewCreator):
instance_attributes = [
"reviewable"
]
default_variants = [
"Main",
"Mask"
]

# TODO: This should be renamed together with Nuke so it is aligned
temp_rendering_path_template = (
Expand Down Expand Up @@ -250,11 +246,7 @@ def _get_reviewable_bool(self):
label="Review",
)

def apply_settings(
self,
project_settings,
system_settings
):
def apply_settings(self, project_settings):
"""Method called on initialization of plugin to apply settings."""

# plugin settings
Expand Down
Loading

0 comments on commit d36b2f1

Please sign in to comment.