Skip to content

Commit 4b97c9d

Browse files
namespace fixes
1 parent 3350e81 commit 4b97c9d

File tree

4 files changed

+26
-23
lines changed

4 files changed

+26
-23
lines changed

Assets/HoloToolkit/Build/Editor/HoloToolkitCommands.cs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@
33
// Licensed under the MIT License. See LICENSE in the project root for license information.
44
//
55

6-
using HoloToolkit.Unity;
7-
8-
/// <summary>
9-
/// Implements functionality for building HoloLens applications
10-
/// </summary>
11-
public static class HoloToolkitCommands
6+
namespace HoloToolkit.Unity
127
{
138
/// <summary>
14-
/// Do a build configured for the HoloLens, returns the error from BuildPipeline.BuildPlayer
9+
/// Implements functionality for building HoloLens applications
1510
/// </summary>
16-
public static bool BuildSLN()
11+
public static class HoloToolkitCommands
1712
{
18-
return BuildDeployTools.BuildSLN(BuildDeployPrefs.BuildDirectory, false);
13+
/// <summary>
14+
/// Do a build configured for the HoloLens, returns the error from BuildPipeline.BuildPlayer
15+
/// </summary>
16+
public static bool BuildSLN()
17+
{
18+
return BuildDeployTools.BuildSLN(BuildDeployPrefs.BuildDirectory, false);
19+
}
1920
}
2021
}

Assets/HoloToolkit/CrossPlatform/Scripts/Reflection/TypeUtils.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

44
using System;
5-
using System.Collections.Generic;
6-
using System.Linq;
7-
using System.Reflection;
8-
using System.Text;
95

10-
public static class TypeUtils
6+
namespace HoloToolkit.Unity
117
{
12-
public static Type GetBaseType(this Type type)
8+
public static class TypeUtils
139
{
10+
public static Type GetBaseType(this Type type)
11+
{
1412
#if UNITY_METRO && !UNITY_EDITOR
15-
return type.GetTypeInfo().BaseType;
13+
return type.GetTypeInfo().BaseType;
1614
#else
17-
return type.BaseType;
15+
return type.BaseType;
1816
#endif
17+
}
1918
}
2019
}

Assets/HoloToolkit/Input/Scripts/Editor/EditorHandsMaterialInspector.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
using UnityEditor;
22

3-
public class EditorHandsMaterialInspector : ShaderGUI
3+
namespace HoloToolkit.Unity
44
{
5-
public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] properties)
5+
public class EditorHandsMaterialInspector : ShaderGUI
66
{
7-
foreach (MaterialProperty materialProperty in properties)
7+
public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] properties)
88
{
9-
if (materialProperty.flags != MaterialProperty.PropFlags.PerRendererData)
9+
foreach (MaterialProperty materialProperty in properties)
1010
{
11-
materialEditor.ShaderProperty(materialProperty, materialProperty.displayName);
11+
if (materialProperty.flags != MaterialProperty.PropFlags.PerRendererData)
12+
{
13+
materialEditor.ShaderProperty(materialProperty, materialProperty.displayName);
14+
}
1215
}
1316
}
1417
}

Assets/HoloToolkit/Utilities/Scripts/Editor/EnforceEditorSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using UnityEditor;
55

6-
namespace HoloToolKit.Unity
6+
namespace HoloToolkit.Unity
77
{
88
/// <summary>
99
/// Sets Force Text Serialization and visible meta files in all projects that use the HoloToolkit.

0 commit comments

Comments
 (0)