Merge remote-tracking branch 'origin/developer' into modellers

ShipPresentation/Saved/Config/CrashReportClient/UE4CC-Windows-E4BFDC204700766F624E75AE33E49C3F/CrashReportClient.ini

@@ -0,0 +1,5 @@
+[CrashReportClient]
+bHideLogFilesOption=false
+bIsAllowedToCloseWithoutSending=true
+CrashConfigPurgeDays=2
+

ShipPresentation/Saved/Config/Windows/EditorPerProjectUserSettings.ini

@@ -948,9 +948,12 @@ HierarchicalLODUtilities.TimeStamp=2020.09.28-09.28.08
 HierarchicalLODUtilities.LastCompileMethod=Unknown
 StaticMeshEditor.TimeStamp=2020.09.28-09.28.23
 StaticMeshEditor.LastCompileMethod=Unknown
+MaterialEditor.TimeStamp=2020.09.28-09.28.11
+MaterialEditor.LastCompileMethod=Unknown
 
 [AssetEditorSubsystem]
 CleanShutdown=True
+OpenAssetsAtExit=/Game/materials/water/water.water
 
 [RootWindow]
 ScreenPosition=X=640.000 Y=340.000
@@ -982,7 +985,7 @@ ContentBrowserTab1.ActiveTypeFilters=
 ContentBrowserTab1.EnabledTypeFilters=
 ContentBrowserTab1.ActiveFrontendFilters=
 ContentBrowserTab1.EnabledFrontendFilters=
-ContentBrowserTab1.SelectedPaths=/Game/meshes/ship
+ContentBrowserTab1.SelectedPaths=/Game/materials/water
 ContentBrowserTab1.Favorites.SelectedPaths=
 FavoritePaths=
 ContentBrowserTab1.CollectionsExpanded=True
@@ -1014,11 +1017,12 @@ Project=D:/UE4/UE_4.26/
 MRUItem0=/Game/maps/NewMap
 
 [ContentBrowserRecent]
-MRUItem0=/Game/meshes/ship/SM_Ship_SM_Radar
-MRUItem1=/Game/meshes/ship/SM_Ship_SM_TrackerHead
-MRUItem2=/Game/meshes/ship/SM_Ship_SM_TrackerBody
-MRUItem3=/Game/meshes/ship/SM_Ship_SM_Ship
-MRUItem4=/Game/blueprints/NewBlueprint
+MRUItem0=/Game/materials/water/water
+MRUItem1=/Game/meshes/ship/SM_Ship_SM_Radar
+MRUItem2=/Game/meshes/ship/SM_Ship_SM_TrackerHead
+MRUItem3=/Game/meshes/ship/SM_Ship_SM_TrackerBody
+MRUItem4=/Game/meshes/ship/SM_Ship_SM_Ship
+MRUItem5=/Game/blueprints/NewBlueprint
 
 [DetailCategories]
 NewBlueprint_C.Tick=True
@@ -1283,6 +1287,23 @@ StaticMeshActor.Tags=True
 StaticMeshActor.Cooking=True
 StaticMeshActor.Replication=True
 StaticMeshActor.Actor=True
+PreviewMaterial.PhysicalMaterial=True
+PreviewMaterial.Material=True
+PreviewMaterial.PhysicalMaterialMask=True
+PreviewMaterial.Translucency=True
+PreviewMaterial.TranslucencySelfShadowing=True
+PreviewMaterial.Usage=True
+PreviewMaterial.Mobile=True
+PreviewMaterial.ForwardShading=True
+PreviewMaterial.Tessellation=True
+PreviewMaterial.Group Sorting=True
+PreviewMaterial.PostProcessMaterial=True
+PreviewMaterial.Refraction=True
+PreviewMaterial.Lightmass=True
+PreviewMaterial.Previewing=True
+PreviewMaterial.ImportSettings=True
+MaterialExpressionMaterialFunctionCall.MaterialExpressionMaterialFunctionCall=True
+MaterialExpressionMaterialFunctionCall.MaterialExpression=True
 
 [AssetEditorToolkitTabLocation]
 /Game/blueprints/NewBlueprint.NewBlueprint=1
@@ -1445,9 +1466,73 @@ bConvertSceneUnit=False
 LastLogListing=FBXImport
 
 [PlacementMode]
+RecentlyPlaced=/Engine/BasicShapes/Plane.Plane;/Engine/Transient.ActorFactoryBasicShape_0
 RecentlyPlaced=/Game/meshes/ship/SM_Ship_SM_Radar.SM_Ship_SM_Radar;
 RecentlyPlaced=/Game/meshes/ship/SM_Ship_SM_TrackerHead.SM_Ship_SM_TrackerHead;
 RecentlyPlaced=/Game/meshes/ship/SM_Ship_SM_TrackerBody.SM_Ship_SM_TrackerBody;
 RecentlyPlaced=/Engine/BasicShapes/Cube.Cube;/Engine/Transient.ActorFactoryBasicShape_0
 RecentlyPlaced=/Game/meshes/ship/SM_Ship_SM_Ship.SM_Ship_SM_Ship;
 
+[/Script/UnrealEd.MaterialEditorOptions]
+bShowGrid=False
+bHideUnrelatedNodes=False
+bUseUnsortedMenus=False
+
+[MaterialEditor]
+PrimType=1
+
+[/Script/UnrealEd.MaterialStatsOptions]
+bPlatformUsed[0]=1
+bPlatformUsed[1]=0
+bPlatformUsed[2]=0
+bPlatformUsed[3]=0
+bPlatformUsed[4]=0
+bPlatformUsed[5]=0
+bPlatformUsed[6]=0
+bPlatformUsed[7]=0
+bPlatformUsed[8]=0
+bPlatformUsed[9]=0
+bPlatformUsed[10]=0
+bPlatformUsed[11]=0
+bPlatformUsed[12]=0
+bPlatformUsed[13]=0
+bPlatformUsed[14]=0
+bPlatformUsed[15]=0
+bPlatformUsed[16]=0
+bPlatformUsed[17]=0
+bPlatformUsed[18]=0
+bPlatformUsed[19]=0
+bPlatformUsed[20]=0
+bPlatformUsed[21]=0
+bPlatformUsed[22]=0
+bPlatformUsed[23]=0
+bPlatformUsed[24]=0
+bPlatformUsed[25]=0
+bPlatformUsed[26]=0
+bPlatformUsed[27]=0
+bPlatformUsed[28]=0
+bPlatformUsed[29]=0
+bPlatformUsed[30]=0
+bPlatformUsed[31]=0
+bPlatformUsed[32]=0
+bPlatformUsed[33]=0
+bPlatformUsed[34]=0
+bPlatformUsed[35]=0
+bPlatformUsed[36]=0
+bPlatformUsed[37]=0
+bPlatformUsed[38]=0
+bPlatformUsed[39]=0
+bPlatformUsed[40]=0
+bPlatformUsed[41]=0
+bPlatformUsed[42]=0
+bPlatformUsed[43]=0
+bPlatformUsed[44]=0
+bPlatformUsed[45]=0
+bPlatformUsed[46]=0
+bPlatformUsed[47]=0
+bPlatformUsed[48]=0
+bMaterialQualityUsed[0]=0
+bMaterialQualityUsed[1]=1
+bMaterialQualityUsed[2]=0
+bMaterialQualityUsed[3]=0
+