Merge branch 'dev'

* dev:
  Updated turntable project to 4.23.
  Set  the Maya publish_turntable plugin to use Unreal Engine 4.23 by default. Logged environment variables passed to turntable script.
  Updated turntable assets and scripts for 4.21/4.22

Author: akitisa-epic

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

@@ -186,7 +186,7 @@ settings.tk-multi-publish2.maya.asset_step:
     settings:
         Work Template: maya_ue4_turntable_render
         Publish Template: maya_ue4_turntable_publish
-        Unreal Engine Version: "4.20"
+        Unreal Engine Version: "4.23"
         Unreal Project Path: "{config}/tk-multi-publish2/tk-maya/unreal/resources/{unreal_engine_version}/turntable/turntable.uproject"
         Turntable Map Path: "/Game/turntable/level/turntable.umap"
         Sequence Path: "/Game/turntable/sequence/turntable_sequence.turntable_sequence"

hooks/tk-multi-publish2/tk-maya/basic/publish_turntable.py

@@ -15,6 +15,11 @@
 
 HookBaseClass = sgtk.get_hook_baseclass()
 
+# Environment variables for turntable script
+OUTPUT_PATH_ENVVAR = 'UNREAL_SG_FBX_OUTPUT_PATH'
+CONTENT_BROWSER_PATH_ENVVAR = 'UNREAL_SG_CONTENT_BROWSER_PATH'
+MAP_PATH_ENVVAR = 'UNREAL_SG_MAP_PATH'
+
 class MayaUnrealTurntablePublishPlugin(HookBaseClass):
     """
     Plugin for publishing an open maya session as an exported FBX.
@@ -397,19 +402,25 @@ def publish(self, settings, item):
         if " " in unreal_project_path:
             unreal_project_path = '"{}"'.format(unreal_project_path)
 
-        script_args = []
-        
+        # Set the script arguments in the environment variables            
         # The FBX to import into Unreal
-        script_args.append(fbx_output_path)
-        
+        os.environ[OUTPUT_PATH_ENVVAR] = fbx_output_path
+        self.logger.info("Setting environment variable {} to {}".format(OUTPUT_PATH_ENVVAR, fbx_output_path))
+
         # The Unreal content browser folder where the asset will be imported into
-        script_args.append(unreal_content_browser_path)
+        os.environ[CONTENT_BROWSER_PATH_ENVVAR] = unreal_content_browser_path
+        self.logger.info("Setting environment variable {} to {}".format(CONTENT_BROWSER_PATH_ENVVAR, unreal_content_browser_path))
 
         # The Unreal turntable map to duplicate where the asset will be instantiated into
-        script_args.append(turntable_map_path)
+        os.environ[MAP_PATH_ENVVAR] = turntable_map_path
+        self.logger.info("Setting environment variable {} to {}".format(MAP_PATH_ENVVAR, turntable_map_path))
+
+        self._unreal_execute_script(unreal_exec_path, unreal_project_path, script_path)
+
+        del os.environ[OUTPUT_PATH_ENVVAR]
+        del os.environ[CONTENT_BROWSER_PATH_ENVVAR]
+        del os.environ[MAP_PATH_ENVVAR]
 
-        self._unreal_execute_script(unreal_exec_path, unreal_project_path, script_path, script_args)
-            
         # =======================
         # 4. Render the turntable to movie.
         # Output the movie to the publish path
@@ -539,12 +550,12 @@ def _maya_export_fbx(self, fbx_output_path):
 
         return True
 
-    def _unreal_execute_script(self, unreal_exec_path, unreal_project_path, script_path, script_args):
+    def _unreal_execute_script(self, unreal_exec_path, unreal_project_path, script_path):
         command_args = []
         command_args.append(unreal_exec_path)       # Unreal executable path
         command_args.append(unreal_project_path)    # Unreal project
 
-        command_args.append('-ExecutePythonScript="{} {}"'.format(script_path, " ".join(script_args)))
+        command_args.append('-ExecutePythonScript="{}"'.format(script_path))
         self.logger.info("Executing script in Unreal with arguments: {}".format(command_args))
 
         print "COMMAND ARGS: %s" % (command_args)

hooks/tk-multi-publish2/tk-maya/unreal/resources/4.21/turntable/Config/DefaultEditor.ini

@@ -0,0 +1,2 @@
+
+

hooks/tk-multi-publish2/tk-maya/unreal/resources/4.21/turntable/Config/DefaultEngine.ini

@@ -0,0 +1,14 @@
+[URL]
+
+[/Script/HardwareTargeting.HardwareTargetingSettings]
+TargetedHardwareClass=Desktop
+AppliedTargetedHardwareClass=Desktop
+DefaultGraphicsPerformance=Maximum
+AppliedDefaultGraphicsPerformance=Maximum
+
+[/Script/IOSRuntimeSettings.IOSRuntimeSettings]
+bSupportsPortraitOrientation=False
+bSupportsUpsideDownOrientation=False
+bSupportsLandscapeLeftOrientation=True
+PreferredLandscapeOrientation=LandscapeLeft
+

hooks/tk-multi-publish2/tk-maya/unreal/resources/4.21/turntable/Config/DefaultGame.ini

@@ -0,0 +1,2 @@
+[/Script/EngineSettings.GeneralProjectSettings]
+ProjectID=B6599CB54F66B6CFD93DC3A95CB55C3D

hooks/tk-multi-publish2/tk-maya/unreal/resources/4.21/turntable/Content/turntable/level/turntable.umap

@@ -0,0 +1,13 @@
+{
+	"FileVersion": 3,
+	"EngineAssociation": "4.21",
+	"Category": "",
+	"Description": "",
+	"Enterprise": true,
+	"Plugins": [
+		{
+			"Name": "PythonScriptPlugin",
+			"Enabled": true
+		}
+	]
+}