Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-26 05:42:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into bugfix/super-very-important-bugfix

Browse source
This commit is contained in:
Ondřej Samohel 2020-12-15 15:20:16 +01:00
commit 4f3fa7edec
No known key found for this signature in database
GPG key ID: 02376E18990A97C6
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pype/modules/ftrack/actions/action_create_cust_attrs.py
View file

@ -211,7 +211,7 @@ class CustomAttributes(BaseAction):
self.groups = {}
self.ftrack_settings = get_system_settings()["modules"]["Ftrack"]
self.ftrack_settings = get_system_settings()["modules"]["ftrack"]
self.attrs_presets = self.prepare_attribute_pressets()
def prepare_attribute_pressets(self):

2
pype/modules/ftrack/lib/settings.py
View file

@ -15,7 +15,7 @@ USER_HANDLERS_DIR = os.path.join(FTRACK_MODULE_DIR, "actions")
def get_ftrack_settings():
return get_system_settings()["modules"]["Ftrack"]
return get_system_settings()["modules"]["ftrack"]
def get_ftrack_url_from_settings():

2
pype/plugins/maya/publish/submit_maya_muster.py
View file

@ -25,7 +25,7 @@ def _get_template_id(renderer):
:rtype: int
"""
templates = get_system_settings()["modules"]["Muster"]["templates_mapping"]
templates = get_system_settings()["modules"]["muster"]["templates_mapping"]
if not templates:
raise RuntimeError(("Muster template mapping missing in "
"pype-settings"))