Revised Unreal Loader templates to better match Shotgun tk-config-default2

Author: ryanmayeda

core/templates.yml

@@ -121,19 +121,23 @@ keys:
         default: ma
         alias: extension
 
-    # These are used by Unreal
-    sg_category_1:
+    # These are used by the Loader in Unreal
+    sg_asset_type_ue4:
         type: str
         shotgun_entity_type: Asset
-        shotgun_field_name: sg_category_1
-    sg_category_2:
+        shotgun_field_name: sg_asset_type
+    sg_asset_name:
         type: str
         shotgun_entity_type: Asset
-        shotgun_field_name: sg_category_2
-    sg_category_3:
+        shotgun_field_name: code
+    sg_shot_name:
         type: str
-        shotgun_entity_type: Asset
-        shotgun_field_name: sg_category_3
+        shotgun_entity_type: Shot
+        shotgun_field_name: code
+    sg_sequence_name:
+        type: str
+        shotgun_entity_type: Shot
+        shotgun_field_name: sg_sequence
 
 #
 # The paths section contains all the the key locations where files are to be stored
@@ -593,13 +597,12 @@ strings:
     # define how new Mari projects should be named
     mari_asset_project_name: "{mari.project_name} - Asset {asset_name}, {task_name}"
 
-    # base templates for a Shotgun asset to import into the Unreal Content Browser
-    unreal_asset_template: "/Game/Assets/{sg_asset_type}/{Asset}/"
-    unreal_asset_notype: "/Game/Assets/{Asset}/"
-    unreal_published_file: "/Game/PublishedFiles/{Asset}/"
-
-    # project-specific templates using categories to classify assets for Unreal import
-    unreal_fields_query: "{sg_asset_type} {Asset} {sg_category_1} {sg_category_2} {sg_category_3}"
-    unreal_asset_3_categories: "/Game/Assets/{sg_category_1}/{sg_category_2}/{sg_category_3}/{Asset}/"
-    unreal_asset_2_categories: "/Game/Assets/{sg_category_1}/{sg_category_2}/{Asset}/"
-    unreal_asset_1_category: "/Game/Assets/{sg_category_1}/{Asset}/"
+    # entity-specific templates for importing files into the Unreal content browser
+    # template logic is defined in Python, not settings:
+    # tk-unreal/hooks/tk-multi-loader2/tk-unreal_actions.py
+    unreal_loader_asset_path: "/Game/Assets/{sg_asset_type_ue4}/{sg_asset_name}/"
+    unreal_loader_asset_name: "{sg_asset_name}_{name}"
+    unreal_loader_shot_path: "/Game/Cinematics/Sequences/{sg_sequence_name}/{sg_shot_name}/"
+    unreal_loader_shot_name: "{sg_shot_name}_{name}"
+    unreal_loader_project_path: "/Game/Assets/"
+    unreal_loader_project_name: "{name}"

env/includes/engine_locations.yml

@@ -84,5 +84,5 @@ engines.tk-unreal.location:
   type: git_branch
   path: [email protected]:shotgunsoftware/tk-unreal
   branch: master
-  version: 1780a1d0156d5227f27d9c85b3ad73b068876ec1
+  version: 54eeb59a34b3f08a5fd8b0f7d27ab05fa658c35b
 

env/includes/settings/tk-desktop.yml

@@ -47,6 +47,7 @@ settings.tk-desktop.project:
     - "*Motion*"
     - "*Nuke*"
     - "*Photoshop*"
+    - "*Unreal*"
     name: Creative Tools
   - matches:
     - "*Hiero*"

env/includes/settings/tk-multi-loader2.yml

@@ -266,10 +266,16 @@ settings.tk-multi-loader2.unreal:
     Maya FBX: [import_content]
   actions_hook: '{engine}/tk-multi-loader2/tk-unreal_actions.py'
   entities:
-  - caption: Current Project
-    type: Hierarchy
-    root: "{context.project}"
-    publish_filters: []
+  - caption: Assets
+    entity_type: Asset
+    filters:
+    - [project, is, '{context.project}']
+    hierarchy: [sg_asset_type, code]
+  - caption: Shots
+    entity_type: Shot
+    filters:
+    - [project, is, '{context.project}']
+    hierarchy: [sg_sequence, code]
   - caption: My Tasks
     type: Query
     entity_type: Task