Merging //UE4/Dev-Main to Dev-VREditor (//UE4/Dev-VREditor) 3349153

#rb none

[CL 3349529 by Lauren Ridge in Dev-VREditor branch]
This commit is contained in:
Lauren Ridge
2017-03-16 11:59:50 -04:00
1209 changed files with 79296 additions and 79618 deletions

View File

@@ -57,6 +57,7 @@ bSCSEditorShowGrid=true
bKeepAttachHierarchy=true
FbxExportCompatibility=FBX_2013
bFbxExportCollisionMesh=False
bForceFrontXAxis=False
; Misc
HoverHighlightIntensity=0.000000
@@ -605,6 +606,9 @@ bImportRigidMesh=False
bCombineMeshes=True
bCreatePhysicsAsset=True
bImportMesh=True
MinimumLodNumber=0
LodNumber=0
bAutoComputeLodDistances=True
[/Script/UnrealEd.FbxStaticMeshImportData]