Skip to content

Commit

Permalink
Merge branch 'develop' into enhancement/asset-lop-add-pick-product-di…
Browse files Browse the repository at this point in the history
…alog
  • Loading branch information
MustafaJafar authored Jul 29, 2024
2 parents 5cd6cf8 + 649c611 commit d1fe79d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 37 deletions.
2 changes: 1 addition & 1 deletion client/ayon_houdini/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
"""Package declaring AYON addon 'houdini' version."""
__version__ = "0.3.10-dev.1"
__version__ = "0.3.11-dev.1"
2 changes: 1 addition & 1 deletion package.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "houdini"
title = "Houdini"
version = "0.3.10-dev.1"
version = "0.3.11-dev.1"

client_dir = "ayon_houdini"

Expand Down
36 changes: 1 addition & 35 deletions server/settings/imageio.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,6 @@
from ayon_server.settings.validators import ensure_unique_names


class ImageIOConfigModel(BaseSettingsModel):
"""[DEPRECATED] Addon OCIO config settings. Please set the OCIO config
path in the Core addon profiles here
(ayon+settings://core/imageio/ocio_config_profiles).
"""

override_global_config: bool = SettingsField(
False,
title="Override global OCIO config",
description=(
"DEPRECATED functionality. Please set the OCIO config path in the "
"Core addon profiles here (ayon+settings://core/imageio/"
"ocio_config_profiles)."
),
)
filepath: list[str] = SettingsField(
default_factory=list,
title="Config path",
description=(
"DEPRECATED functionality. Please set the OCIO config path in the "
"Core addon profiles here (ayon+settings://core/imageio/"
"ocio_config_profiles)."
),
)


class ImageIOFileRuleModel(BaseSettingsModel):
name: str = SettingsField("", title="Rule name")
pattern: str = SettingsField("", title="Regex pattern")
Expand Down Expand Up @@ -81,10 +55,6 @@ class HoudiniImageIOModel(BaseSettingsModel):
activate_host_color_management: bool = SettingsField(
True, title="Enable Color Management"
)
ocio_config: ImageIOConfigModel = SettingsField(
default_factory=ImageIOConfigModel,
title="OCIO config"
)
file_rules: ImageIOFileRulesModel = SettingsField(
default_factory=ImageIOFileRulesModel,
title="File Rules"
Expand All @@ -96,11 +66,7 @@ class HoudiniImageIOModel(BaseSettingsModel):


DEFAULT_IMAGEIO_SETTINGS = {
"activate_host_color_management": False,
"ocio_config": {
"override_global_config": False,
"filepath": []
},
"activate_host_color_management": True,
"file_rules": {
"activate_host_rules": False,
"rules": []
Expand Down

0 comments on commit d1fe79d

Please sign in to comment.