Skip to content

Commit 5530ef2

Browse files
committed
Version 1.2.2
1 parent e3d9676 commit 5530ef2

22 files changed

+689
-328
lines changed

Assets/SteamVR/Editor/SteamVR_RenderModelEditor.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using UnityEditor;
99
using System.Text;
1010
using System.Collections.Generic;
11-
using Valve.VR;
1211

1312
[CustomEditor(typeof(SteamVR_RenderModel)), CanEditMultipleObjects]
1413
public class SteamVR_RenderModelEditor : Editor
@@ -85,7 +84,7 @@ public override void OnInspectorGUI()
8584
//EditorGUILayout.PropertyField(modelOverride);
8685

8786
GUILayout.BeginHorizontal();
88-
GUILayout.Label("Model Override");
87+
GUILayout.Label(new GUIContent("Model Override", SteamVR_RenderModel.modelOverrideWarning));
8988
var selected = EditorGUILayout.Popup(renderModelIndex, renderModelNames);
9089
if (selected != renderModelIndex)
9190
{

Assets/SteamVR/Editor/SteamVR_Update.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[InitializeOnLoad]
1313
public class SteamVR_Update : EditorWindow
1414
{
15-
const string currentVersion = "1.2.1";
15+
const string currentVersion = "1.2.2";
1616
const string versionUrl = "http://media.steampowered.com/apps/steamvr/unitypluginversion.txt";
1717
const string notesUrl = "http://media.steampowered.com/apps/steamvr/unityplugin-v{0}.txt";
1818
const string pluginUrl = "http://u3d.as/content/valve-corporation/steam-vr-plugin";

0 commit comments

Comments
 (0)