Skip to content

Commit 92f37bd

Browse files
authored
Merge pull request #411 from Unity-Technologies/UNI-48338-standardized-fbxsdk-namespace
Uni 48338 standardized fbxsdk namespace
2 parents d12651d + 4ad6cd9 commit 92f37bd

File tree

129 files changed

+1597
-1597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+1597
-1597
lines changed

Assets/com.unity.formats.fbx.tests/CustomExtensionsTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Collections.Generic;
99
using System.Collections;
1010
using FbxExporters.CustomExtensions;
11-
using Unity.FbxSdk;
11+
using UnityEngine.Formats.FbxSdk;
1212

1313
namespace FbxExporters.UnitTests
1414
{

Assets/com.unity.formats.fbx.tests/DefaultSelectionTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using NUnit.Framework;
55
using System.IO;
66
using System.Collections.Generic;
7-
using Unity.FbxSdk;
7+
using UnityEngine.Formats.FbxSdk;
88
using FbxExporters.EditorTools;
99

1010
namespace FbxExporters.UnitTests

Assets/com.unity.formats.fbx.tests/ExporterTestBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using UnityEngine.TestTools;
44
using NUnit.Framework;
55
using System.IO;
6-
using Unity.FbxSdk;
6+
using UnityEngine.Formats.FbxSdk;
77

88
namespace FbxExporters.UnitTests
99
{

Assets/com.unity.formats.fbx.tests/FbxExporterReflection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Linq;
44
using System.Collections.Generic;
55
using System.Reflection;
6-
using Unity.FbxSdk;
6+
using UnityEngine.Formats.FbxSdk;
77
using UnityEngine;
88

99
namespace FbxExporters.UnitTests

Assets/com.unity.formats.fbx.tests/ModelExporterTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using UnityEngine.TestTools;
55
using NUnit.Framework;
66
using System.Collections.Generic;
7-
using Unity.FbxSdk;
7+
using UnityEngine.Formats.FbxSdk;
88
using FbxExporters.Editor;
99

1010
namespace FbxExporters.UnitTests

Assets/com.unity.formats.fbx.tests/com.unity.formats.fbx.editortests.asmdef

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "com.unity.formats.fbx.editortests",
33
"references": [
44
"com.unity.formats.fbx.editor",
5-
"com.unity.formats.fbxsdk",
5+
"Unity.Formats.FbxSdk",
66
"com.unity.formats.fbx.runtime"
77
],
88
"optionalUnityReferences": [

Packages/com.unity.formats.fbx/Editor/Scripts/CameraVisitor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using UnityEngine;
2-
using Unity.FbxSdk;
2+
using UnityEngine.Formats.FbxSdk;
33
using FbxExporters.CustomExtensions;
44

55
namespace FbxExporters

Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using UnityEngine;
44
using UnityEngine.SceneManagement;
55
using UnityEditor;
6-
using Unity.FbxSdk;
6+
using UnityEngine.Formats.FbxSdk;
77
using System.Linq;
88

99
namespace FbxExporters

Packages/com.unity.formats.fbx/Editor/Scripts/CustomExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using UnityEngine;
3-
using Unity.FbxSdk;
3+
using UnityEngine.Formats.FbxSdk;
44

55
namespace FbxExporters
66
{

Packages/com.unity.formats.fbx/Editor/Scripts/FbxExporter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using UnityEngine.Animations;
55
using UnityEditor;
66
using System.Linq;
7-
using Unity.FbxSdk;
7+
using UnityEngine.Formats.FbxSdk;
88
using FbxExporters.EditorTools;
99
using FbxExporters.Visitors;
1010
using FbxExporters.CustomExtensions;
@@ -1263,7 +1263,7 @@ protected bool ExportInstance (GameObject unityGo, FbxNode fbxNode, FbxScene fbx
12631263
var renderer = unityGo.GetComponent<Renderer>();
12641264
var materials = renderer ? renderer.sharedMaterials : null;
12651265

1266-
Unity.FbxSdk.FbxSurfaceMaterial newMaterial = null;
1266+
UnityEngine.Formats.FbxSdk.FbxSurfaceMaterial newMaterial = null;
12671267
if (materials != null)
12681268
{
12691269
foreach (var mat in materials) {

0 commit comments

Comments
 (0)