I_Jemin / Unity-OpenVR-Shooter-Template

Go to a project
Toggle navigation Toggle navigation pinning
I_Jemin
67f8ce80 1 parent 68152ce5

Update to Unity2017.3P2

Inline Side-by-side
Showing 2 changed files with 61 additions and 5 deletions
{
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitignore":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
"**/*.user":true,
"**/*.userprefs":true,
"**/*.unityproj":true,
"**/*.dll":true,
"**/*.exe":true,
"**/*.pdf":true,
"**/*.mid":true,
"**/*.midi":true,
"**/*.wav":true,
"**/*.gif":true,
"**/*.ico":true,
"**/*.jpg":true,
"**/*.jpeg":true,
"**/*.png":true,
"**/*.psd":true,
"**/*.tga":true,
"**/*.tif":true,
"**/*.tiff":true,
"**/*.3ds":true,
"**/*.3DS":true,
"**/*.fbx":true,
"**/*.FBX":true,
"**/*.lxo":true,
"**/*.LXO":true,
"**/*.ma":true,
"**/*.MA":true,
"**/*.obj":true,
"**/*.OBJ":true,
"**/*.asset":true,
"**/*.cubemap":true,
"**/*.flare":true,
"**/*.mat":true,
"**/*.meta":true,
"**/*.prefab":true,
"**/*.unity":true,
"build/":true,
"Build/":true,
"Library/":true,
"library/":true,
"obj/":true,
"Obj/":true,
"ProjectSettings/":true,
"temp/":true,
"Temp/":true
}
}
\ No newline at end of file
......@@ -376,7 +376,7 @@ namespace UnityEditor.PostProcessing
// Draw
if (state.showNonEditableHandles)
{
if (e.type == EventType.repaint)
if (e.type == EventType.Repaint)
{
var selectedColor = (isCurrentlySelectedCurve && isCurrentlySelectedKeyframe)
? settings.selectionColor
......@@ -422,7 +422,7 @@ namespace UnityEditor.PostProcessing
}
// Keyframe selection & context menu
if (e.type == EventType.mouseDown && rect.Contains(e.mousePosition))
if (e.type == EventType.MouseDown && rect.Contains(e.mousePosition))
{
if (hitRect.Contains(e.mousePosition))
{
......@@ -453,7 +453,7 @@ namespace UnityEditor.PostProcessing
}
// Tangent selection & edit mode
if (e.type == EventType.mouseDown && rect.Contains(e.mousePosition))
if (e.type == EventType.MouseDown && rect.Contains(e.mousePosition))
{
if (inTangentHitRect.Contains(e.mousePosition) && (k > 0 || state.loopInBounds))
{
......@@ -499,7 +499,7 @@ namespace UnityEditor.PostProcessing
var e = Event.current;
// Selection
if (e.type == EventType.mouseDown)
if (e.type == EventType.MouseDown)
{
GUI.FocusControl(null);
m_SelectedCurve = null;
......@@ -582,7 +582,7 @@ namespace UnityEditor.PostProcessing
}
// Delete selected key(s)
if (e.type == EventType.keyDown && (e.keyCode == KeyCode.Delete || e.keyCode == KeyCode.Backspace))
if (e.type == EventType.KeyDown && (e.keyCode == KeyCode.Delete || e.keyCode == KeyCode.Backspace))
{
if (m_SelectedKeyframeIndex != -1 && m_SelectedCurve != null)
{
......