Skip to content

Commit a0050fc

Browse files
gplstephrob-aitchisonToolkittystaceyoue
authored
8196 config improv 2 (#2)
* Added smart_reference and import_with_options to VRED Loader settings. (#111) * Updated tk-nuke to v0.14.3 Release notes: https://github.com/shotgunsoftware/tk-nuke/wiki/Release-Notes#v0143 * Updated tk-desktop to v2.6.2 Release notes: https://github.com/shotgunsoftware/tk-desktop/wiki/Release-Notes#v262 * Updated tk-core to v0.20.9 Release notes: https://github.com/shotgunsoftware/tk-core/wiki/Release-Notes#v0209 * SHOT-3905: Update config settings for Alias/VRED upload version publish plugin (#112) * The Alias/VRED upload_version publish plugins now provide UI to toggle between 2D/3D Version creation for review * SHOT-3907: add python console to Alias and VRED (#113) * Add Python Console app to VRED and run at start up * Add VRED settings for docked widgets * Updated tk-vred to v2.1.3 Release notes: https://github.com/shotgunsoftware/tk-vred/wiki/Release-Notes#v213 * Updated tk-alias to v2.1.3 Release notes: https://github.com/shotgunsoftware/tk-alias/wiki/Release-Notes#v213 * Updated tk-core to v0.20.10 Release notes: https://github.com/shotgunsoftware/tk-core/wiki/Release-Notes#v02010 * Updated tk-core to v0.20.11 Release notes: https://github.com/shotgunsoftware/tk-core/wiki/Release-Notes#v02011 * For #8196, unreal asset step and FBX Allowed FBX to be imported or referenced in Maya. Removed Unreal asset step not used anymore. Co-authored-by: Rob Aitchison <[email protected]> Co-authored-by: Toolkitty <[email protected]> Co-authored-by: Stacey Oue <[email protected]>
1 parent e18f8d8 commit a0050fc

File tree

14 files changed

+67
-35
lines changed

14 files changed

+67
-35
lines changed

‎core/core_api.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
location:
1515
type: app_store
1616
name: tk-core
17-
version: v0.20.8
17+
version: v0.20.11

‎env/asset_step.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ includes:
2525
- includes/alias/asset_step.yml
2626
- includes/vred/asset_step.yml
2727
- includes/shotgun/all.yml
28-
- includes/unreal/settings/tk-unreal.yml
2928

3029
engines:
3130
tk-desktop2: '@desktop2.all'
@@ -42,6 +41,3 @@ engines:
4241
tk-alias: '@alias.asset_step'
4342
tk-vred: '@vred.asset_step'
4443
tk-shotgun: '@shotgun.all'
45-
# Disabled for now since there is nothing specific
46-
# for Asset step in tk-unreal at the moment.
47-
# tk-unreal: "@settings.tk-unreal.asset_step"

‎env/includes/alias/apps.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ alias.apps.tk-multi-publish2:
2828
- name: Publish to ShotGrid
2929
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py"
3030
settings: {}
31-
- name: Create 3D Version for Review
31+
- name: Create Version for Review
3232
hook: "{self}/upload_version.py:{engine}/tk-multi-publish2/basic/upload_version.py"
3333
settings:
34-
3D Version: True
34+
Version Type: 2D Version
3535
- name: Publish Variants to ShotGrid
3636
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_variants.py"
3737
settings: {}

‎env/includes/alias/asset_step.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ alias.asset_step:
2121
apps:
2222
tk-multi-about: '@common.apps.tk-multi-about'
2323

24+
tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
25+
2426
tk-multi-publish2: '@alias.apps.tk-multi-publish2'
2527

2628
tk-multi-loader2: '@alias.apps.tk-multi-loader2'
2729

2830
tk-multi-shotgunpanel: '@alias.apps.tk-multi-shotgunpanel'
2931

30-
3132
location: "@common.engines.tk-alias.location"
3233
menu_favourites: []
3334
run_at_startup:

‎env/includes/alias/project.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ alias.project:
2222
apps:
2323
tk-multi-about: '@common.apps.tk-multi-about'
2424

25+
tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
26+
2527
tk-multi-publish2: '@alias.apps.tk-multi-publish2'
2628

2729
tk-multi-loader2: '@alias.apps.tk-multi-loader2'

‎env/includes/alias/site.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ alias.site:
2222

2323
tk-multi-about: '@common.apps.tk-multi-about'
2424

25+
tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
26+
2527
tk-multi-loader2:
2628
action_mappings:
2729
Alias File: [import, import_as_reference]

‎env/includes/common/engines.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ common.engines.tk-maya.location:
3131
common.engines.tk-nuke.location:
3232
type: app_store
3333
name: tk-nuke
34-
version: v0.14.2
34+
version: v0.14.3
3535
common.engines.tk-photoshopcc.location:
3636
type: app_store
3737
name: tk-photoshopcc
@@ -47,15 +47,15 @@ common.engines.tk-flame.location:
4747
common.engines.tk-alias.location:
4848
type: app_store
4949
name: tk-alias
50-
version: v2.1.2
50+
version: v2.1.3
5151
common.engines.tk-vred.location:
5252
type: app_store
5353
name: tk-vred
54-
version: v2.1.2
54+
version: v2.1.3
5555
common.engines.tk-desktop.location:
5656
type: app_store
5757
name: tk-desktop
58-
version: v2.6.1
58+
version: v2.6.2
5959
common.engines.tk-desktop2.location:
6060
type: app_store
6161
name: tk-desktop2

‎env/includes/maya/apps.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ maya.apps.tk-multi-loader2:
3535
Alembic Cache: [reference, import]
3636
Image: [texture_node, image_plane]
3737
Maya Scene: [reference, import]
38+
Maya FBX: [reference, import]
3839
Photoshop Image: [texture_node, image_plane]
3940
Rendered Image: [texture_node, image_plane]
4041
Texture: [texture_node, image_plane]
42+
Unreal FBX: [reference, import]
4143
actions_hook: '{self}/tk-maya_actions.py'
4244
entities:
4345
- caption: Current Project
@@ -68,12 +70,16 @@ maya.apps.tk-multi-shotgunpanel:
6870
filters: {published_file_type: Image}
6971
- actions: [reference, import]
7072
filters: {published_file_type: Maya Scene}
73+
- actions: [reference, import]
74+
filters: {published_file_type: Maya FBX}
7175
- actions: [texture_node, image_plane]
7276
filters: {published_file_type: Photoshop Image}
7377
- actions: [texture_node, image_plane]
7478
filters: {published_file_type: Rendered Image}
7579
- actions: [texture_node, image_plane]
7680
filters: {published_file_type: Texture}
81+
- actions: [reference, import]
82+
filters: {published_file_type: Unreal FBX}
7783
- actions: [publish_clipboard]
7884
filters: {}
7985
Task:

‎env/includes/unreal/settings/tk-multi-shotgunpanel.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ includes:
77

88
settings.tk-multi-shotgunpanel.unreal:
99
actions_hook: '{self}/general_actions.py:{engine}/tk-multi-shotgunpanel/tk-unreal_actions.py'
10-
action_mappings: {}
11-
enable_context_switch: true
10+
action_mappings:
11+
PublishedFile:
12+
- actions: [publish_clipboard]
13+
filters: {}
14+
# Disable context switching since we only have a Project context.
15+
enable_context_switch: false
1216
location: "@common.apps.tk-multi-shotgunpanel.location"
1317

‎env/includes/unreal/settings/tk-unreal.yml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,6 @@ includes:
1414

1515
################################################################################
1616

17-
# asset_step
18-
settings.tk-unreal.asset_step:
19-
apps:
20-
tk-multi-about: '@common.apps.tk-multi-about'
21-
tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
22-
location: "@tk-unreal.location"
23-
menu_favourites: []
24-
run_at_startup: []
25-
launch_builtin_plugins: [basic]
26-
automatic_context_switch: false
2717

2818
# project
2919
settings.tk-unreal.project:
@@ -39,3 +29,4 @@ settings.tk-unreal.project:
3929
- {app_instance: tk-multi-shotgunpanel, name: ''}
4030
launch_builtin_plugins: [basic]
4131
automatic_context_switch: false
32+

0 commit comments

Comments
 (0)