Merge branch 'sgmaster'

Author: gplsteph

core/core_api.yml

@@ -14,4 +14,4 @@
 location:
   type: app_store
   name: tk-core
-  version: v0.21.2
+  version: v0.21.4

env/asset_step.yml

@@ -36,7 +36,6 @@ engines:
   tk-shell: '@shell.asset_step'
   tk-photoshopcc: '@photoshopcc.asset_step'
   tk-aftereffects: '@aftereffects.asset_step'
-  tk-3dsmaxplus: '@3dsmaxplus.asset_step'
   tk-3dsmax: '@3dsmax.asset_step'
   tk-alias: '@alias.asset_step'
   tk-vred: '@vred.asset_step'

env/includes/3dsmax/apps.yml

@@ -16,9 +16,7 @@ includes:
 - ../common/apps.yml
 - ../common/settings/tk-multi-publish2.yml
 
-# tk-3dsmaxplus app settings
-
-3dsmaxplus.apps.tk-multi-publish2: &3dsmaxplus_apps_tk-multi-publish2
+3dsmax.apps.tk-multi-publish2:
   help_url: "@common.apps.tk-multi-publish2.help_url"
   collector: "{self}/collector.py:{engine}/tk-multi-publish2/basic/collector.py"
   publish_plugins:
@@ -32,14 +30,14 @@ includes:
       settings: {}
   location: "@common.apps.tk-multi-publish2.location"
 
-3dsmaxplus.apps.tk-multi-loader2: &3dsmaxplus_apps_tk-multi-loader2
+3dsmax.apps.tk-multi-loader2:
   action_mappings:
     3dsmax Scene: [import, reference]
     Alembic Cache: [import]
     Image: [texture_node]
     Rendered Image: [texture_node]
     Texture: [texture_node]
-  actions_hook: '{self}/tk-3dsmaxplus_actions.py'
+  actions_hook: "{engine}/tk-multi-loader2/basic/scene_actions.py"
   download_thumbnails: true
   entities:
   - caption: Current Project
@@ -60,9 +58,9 @@ includes:
   publish_filters: [["sg_status_list", "is_not", null]]
   location: "@common.apps.tk-multi-loader2.location"
 
-3dsmaxplus.apps.tk-multi-shotgunpanel: &3dsmaxplus_apps_tk-multi-shotgunpanel
+3dsmax.apps.tk-multi-shotgunpanel:
   shotgun_fields_hook: '{self}/shotgun_fields.py'
-  actions_hook: '{self}/general_actions.py:{self}/tk-3dsmaxplus_actions.py'
+  actions_hook: "{engine}/tk-multi-shotgunpanel/basic/scene_actions.py"
   action_mappings:
     Note:
     - actions: [ note_to_ip, note_to_closed ]
@@ -94,14 +92,6 @@ includes:
   enable_context_switch: true
   location: "@common.apps.tk-multi-shotgunpanel.location"
 
-# tk-3dsmax app settings
 3dsmax.apps.tk-multi-setframerange:
   hook_frame_operation: "{engine}/tk-multi-setframerange/basic/frame_operations.py"
   location: "@common.apps.tk-multi-setframerange.location"
-3dsmax.apps.tk-multi-publish2: *3dsmaxplus_apps_tk-multi-publish2
-3dsmax.apps.tk-multi-loader2:
-  <<: *3dsmaxplus_apps_tk-multi-loader2
-  actions_hook: "{engine}/tk-multi-loader2/basic/scene_actions.py"
-3dsmax.apps.tk-multi-shotgunpanel:
-  <<: *3dsmaxplus_apps_tk-multi-shotgunpanel
-  actions_hook: "{engine}/tk-multi-shotgunpanel/basic/scene_actions.py"

env/includes/3dsmax/asset_step.yml

@@ -17,23 +17,6 @@ includes:
 - ../common/apps.yml
 - apps.yml
 
-3dsmaxplus.asset_step:
-  apps:
-    tk-multi-about: '@common.apps.tk-multi-about'
-
-    tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
-
-    tk-multi-publish2: '@3dsmaxplus.apps.tk-multi-publish2'
-
-    tk-multi-loader2: '@3dsmaxplus.apps.tk-multi-loader2'
-
-    tk-multi-shotgunpanel: '@3dsmaxplus.apps.tk-multi-shotgunpanel'
-
-  location: "@common.engines.tk-3dsmaxplus.location"
-  menu_favourites: []
-  launch_builtin_plugins: [basic]
-
-
 3dsmax.asset_step:
   apps:
     tk-multi-about: '@common.apps.tk-multi-about'

env/includes/3dsmax/project.yml

@@ -17,22 +17,6 @@ includes:
 - ../common/apps.yml
 - apps.yml
 
-3dsmaxplus.project:
-  apps:
-    tk-multi-about: '@common.apps.tk-multi-about'
-
-    tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
-
-    tk-multi-publish2: '@3dsmaxplus.apps.tk-multi-publish2'
-
-    tk-multi-loader2: '@3dsmaxplus.apps.tk-multi-loader2'
-
-    tk-multi-shotgunpanel: '@3dsmaxplus.apps.tk-multi-shotgunpanel'
-
-  location: "@common.engines.tk-3dsmaxplus.location"
-  menu_favourites: []
-  launch_builtin_plugins: [basic]
-
 3dsmax.project:
   apps:
     tk-multi-about: '@common.apps.tk-multi-about'

env/includes/3dsmax/shot.yml

@@ -17,24 +17,6 @@ includes:
 - ../common/apps.yml
 - apps.yml
 
-3dsmaxplus.shot:
-  apps:
-    tk-multi-about: '@common.apps.tk-multi-about'
-
-    tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
-
-    tk-multi-setframerange: '@common.apps.tk-multi-setframerange'
-
-    tk-multi-publish2: '@3dsmaxplus.apps.tk-multi-publish2'
-
-    tk-multi-loader2: '@3dsmaxplus.apps.tk-multi-loader2'
-
-    tk-multi-shotgunpanel: '@3dsmaxplus.apps.tk-multi-shotgunpanel'
-
-  location: "@common.engines.tk-3dsmaxplus.location"
-  menu_favourites: []
-  launch_builtin_plugins: [basic]
-
 3dsmax.shot:
   apps:
     tk-multi-about: '@common.apps.tk-multi-about'

env/includes/3dsmax/shot_step.yml

@@ -17,25 +17,6 @@ includes:
 - ../common/apps.yml
 - apps.yml
 
-3dsmaxplus.shot_step:
-  apps:
-    tk-multi-about: '@common.apps.tk-multi-about'
-
-    tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
-
-    tk-multi-setframerange: '@common.apps.tk-multi-setframerange'
-
-    tk-multi-publish2: '@3dsmaxplus.apps.tk-multi-publish2'
-
-    tk-multi-loader2: '@3dsmaxplus.apps.tk-multi-loader2'
-
-    tk-multi-shotgunpanel: '@3dsmaxplus.apps.tk-multi-shotgunpanel'
-
-  location: "@common.engines.tk-3dsmaxplus.location"
-  menu_favourites: []
-  launch_builtin_plugins: [basic]
-
-
 3dsmax.shot_step:
   apps:
     tk-multi-about: '@common.apps.tk-multi-about'

env/includes/3dsmax/site.yml

@@ -18,20 +18,20 @@ includes:
 - apps.yml
 
 
-3dsmaxplus.site:
+3dsmax.site:
   apps:
     tk-multi-about: '@common.apps.tk-multi-about'
 
     tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
 
-    tk-multi-loader2: &3dsmaxplus_site_tk-multi-loader2
+    tk-multi-loader2:
       action_mappings:
         3dsmax Scene: [import, reference]
         Alembic Cache: [import]
         Image: [texture_node]
         Rendered Image: [texture_node]
         Texture: [texture_node]
-      actions_hook: '{self}/tk-3dsmaxplus_actions.py'
+      actions_hook: '{engine}/tk-multi-loader2/basic/scene_actions.py'
       entities:
       - caption: Project
         type: Hierarchy
@@ -50,22 +50,6 @@ includes:
       publish_filters: [["sg_status_list", "is_not", null]]
       location: "@common.apps.tk-multi-loader2.location"
 
-    tk-multi-shotgunpanel: '@3dsmaxplus.apps.tk-multi-shotgunpanel'
-
-  location: "@common.engines.tk-3dsmaxplus.location"
-  menu_favourites: []
-  launch_builtin_plugins: [basic]
-
-3dsmax.site:
-  apps:
-    tk-multi-about: '@common.apps.tk-multi-about'
-
-    tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
-
-    tk-multi-loader2:
-      <<: *3dsmaxplus_site_tk-multi-loader2
-      actions_hook: '{engine}/tk-multi-loader2/basic/scene_actions.py'
-
     tk-multi-shotgunpanel: '@3dsmax.apps.tk-multi-shotgunpanel'
 
   location: "@common.engines.tk-3dsmax.location"

env/includes/common/apps.yml

@@ -35,11 +35,11 @@ common.apps.tk-multi-setframerange:
 common.apps.tk-multi-publish2.location:
   type: app_store
   name: tk-multi-publish2
-  version: v2.8.3
+  version: v2.8.4
 common.apps.tk-multi-loader2.location:
   type: app_store
   name: tk-multi-loader2
-  version: v1.25.0
+  version: v1.25.1
 common.apps.tk-multi-shotgunpanel.location:
   type: app_store
   name: tk-multi-shotgunpanel
@@ -57,7 +57,7 @@ common.apps.tk-multi-setframerange.location:
   type: app_store
   name: tk-multi-setframerange
 common.apps.tk-multi-data-validation.location:
-  version: v0.2.0
+  version: v0.3.0
   type: app_store
   name: tk-multi-data-validation
 common.apps.tk-nuke-quickreview.location:

env/includes/common/engines.yml

@@ -11,27 +11,22 @@
 
 # locations for common engines
 
-# 3dsMax using the tk-3dsmaxplus engine
-common.engines.tk-3dsmaxplus.location:
-  type: app_store
-  name: tk-3dsmaxplus
-  version: v0.6.2
 common.engines.tk-3dsmax.location:
   type: app_store
   name: tk-3dsmax
-  version: v1.3.0
+  version: v1.4.0
 common.engines.tk-houdini.location:
   type: app_store
   name: tk-houdini
-  version: v1.9.0
+  version: v1.9.1
 common.engines.tk-maya.location:
   type: app_store
   name: tk-maya
-  version: v0.12.1
+  version: v0.13.0
 common.engines.tk-nuke.location:
   type: app_store
   name: tk-nuke
-  version: v0.15.0
+  version: v0.15.1
 common.engines.tk-photoshopcc.location:
   type: app_store
   name: tk-photoshopcc
@@ -47,15 +42,15 @@ common.engines.tk-flame.location:
 common.engines.tk-alias.location:
   type: app_store
   name: tk-alias
-  version: v3.2.0
+  version: v3.3.0
 common.engines.tk-vred.location:
   type: app_store
   name: tk-vred
-  version: v3.2.1
+  version: v3.3.0
 common.engines.tk-desktop.location:
   type: app_store
   name: tk-desktop
-  version: v2.7.1
+  version: v2.7.2
 common.engines.tk-desktop2.location:
   type: app_store
   name: tk-desktop2