From 01c1ae89117f91fbea86bb29b537855b69bc65db Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Thu, 3 Dec 2020 20:45:58 +0100 Subject: [PATCH] asset creator tool uses settings (hidden for now) --- .../ftrack/project_schemas/default.json | 39 +++++++++++++++++++ pype/tools/assetcreator/app.py | 4 +- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 pype/settings/defaults/project_settings/ftrack/project_schemas/default.json diff --git a/pype/settings/defaults/project_settings/ftrack/project_schemas/default.json b/pype/settings/defaults/project_settings/ftrack/project_schemas/default.json new file mode 100644 index 0000000000..a90a0b3a8b --- /dev/null +++ b/pype/settings/defaults/project_settings/ftrack/project_schemas/default.json @@ -0,0 +1,39 @@ +{ + "object_types": ["Milestone", "Task", "Folder", "Asset Build", "Shot", "Library", "Sequence"], + "version_workflow": ["Pending Review", "Client Review", "On Farm", "Reviewed", "Render Complete", "Approved", "CBB", "Delivered", "Render Failed", "data"], + "task_workflow": ["Not Ready", "Ready", "Change Requested", "In progress", "Pending Review", "On Farm", "Waiting", "Render Complete", "Complete", "CBB", "On Hold", "Render Failed", "Omitted"], + "overrides": [{ + "task_types": ["Animation"], + "statuses": ["Not Ready", "Ready", "Change Requested", "Blocking", "Animating", "blocking review", "anim review", "Complete", "CBB", "On Hold", "Omitted"] + }, { + "task_types": ["Lighting"], + "statuses": ["Not Ready", "Ready", "Change Requested", "In progress", "To render", "On Farm", "Render Complete", "Complete", "CBB", "On Hold", "Render Failed", "Omitted"] + }], + "task_type_schema": ["Layout", "Animation", "Modeling", "Previz", "Lookdev", "FX", "Lighting", "Compositing", "Rigging", "Texture", "Matte-paint", "Roto-paint", "Art", "Match-moving", "Production", "Build", "Setdress", "Edit", "R&D", "Boards"], + "schemas": [{ + "object_type": "Shot", + "statuses": ["Omitted", "Normal", "Complete"], + "task_types": [] + }, { + "object_type": "Asset Build", + "statuses": ["Omitted", "Normal", "Complete"], + "task_types": ["Setups", "Sets", "Characters", "Props", "Locations", "Assembly", "R&D", "Elements"] + }, { + "object_type": "Milestone", + "statuses": ["Normal", "Complete"], + "task_types": ["Generic"] + }], + "task_templates": [{ + "name": "Character", + "task_types": ["Art", "Modeling", "Lookdev", "Rigging"] + }, { + "name": "Element", + "task_types": ["Modeling", "Lookdev"] + }, { + "name": "Prop", + "task_types": ["Modeling", "Lookdev", "Rigging"] + }, { + "name": "Location", + "task_types": ["Layout", "Setdress"] + }] +} \ No newline at end of file diff --git a/pype/tools/assetcreator/app.py b/pype/tools/assetcreator/app.py index 71b1027ef4..f025af9662 100644 --- a/pype/tools/assetcreator/app.py +++ b/pype/tools/assetcreator/app.py @@ -6,7 +6,7 @@ try: import ftrack_api_old as ftrack_api except Exception: import ftrack_api -from pype.api import config +from pype.api import get_current_project_settings from pype import lib as pypelib from avalon.vendor.Qt import QtWidgets, QtCore from avalon import io, api, style, schema @@ -196,7 +196,7 @@ class Window(QtWidgets.QDialog): ft_project = session.query(project_query).one() schema_name = ft_project['project_schema']['name'] # Load config - schemas_items = config.get_presets().get('ftrack', {}).get( + schemas_items = get_current_project_settings().get('ftrack', {}).get( 'project_schemas', {} ) # Get info if it is silo project