From 31c2cebbccba45a00a755981dd6d0cdd0a0459e9 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 14 八月 2018 17:28:38 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Assets/Editor/MemoryProfiler/MemoryProfilerWindow.cs | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Assets/Editor/MemoryProfiler/MemoryProfilerWindow.cs b/Assets/Editor/MemoryProfiler/MemoryProfilerWindow.cs
index 89cee9b..1af75aa 100644
--- a/Assets/Editor/MemoryProfiler/MemoryProfilerWindow.cs
+++ b/Assets/Editor/MemoryProfiler/MemoryProfilerWindow.cs
@@ -76,33 +76,33 @@
if (GUILayout.Button("Take Snapshot"))
{
UnityEditor.EditorUtility.DisplayProgressBar("Take Snapshot", "Downloading Snapshot...", 0.0f);
- try
- {
- UnityEditor.MemoryProfiler.MemorySnapshot.RequestNewSnapshot();
+ try
+ {
+ UnityEditor.MemoryProfiler.MemorySnapshot.RequestNewSnapshot();
}
- finally
- {
- EditorUtility.ClearProgressBar();
+ finally
+ {
+ EditorUtility.ClearProgressBar();
}
}
EditorGUI.BeginDisabledGroup(_snapshot == null);
if (GUILayout.Button("Save Snapshot..."))
- {
+ {
PackedMemorySnapshotUtility.SaveToFile(_snapshot);
}
EditorGUI.EndDisabledGroup();
if (GUILayout.Button("Load Snapshot..."))
{
- PackedMemorySnapshot packedSnapshot = PackedMemorySnapshotUtility.LoadFromFile();
- if(packedSnapshot != null)
+ PackedMemorySnapshot packedSnapshot = PackedMemorySnapshotUtility.LoadFromFile();
+ if(packedSnapshot != null)
IncomingSnapshot(packedSnapshot);
- }
-
- if (_unpackedCrawl != null)
- {
- GUILayout.Label(string.Format("Total memory: {0}", EditorUtility.FormatBytes(_unpackedCrawl.totalSize)));
+ }
+
+ if (_unpackedCrawl != null)
+ {
+ GUILayout.Label(string.Format("Total memory: {0}", EditorUtility.FormatBytes(_unpackedCrawl.totalSize)));
}
GUILayout.EndHorizontal();
if (_treeMapView != null)
@@ -157,20 +157,20 @@
void IncomingSnapshot(PackedMemorySnapshot snapshot)
{
- _snapshot = snapshot;
-
- UnityEditor.EditorUtility.DisplayProgressBar("Take Snapshot", "Crawling Snapshot...", 0.33f);
- try
- {
- _packedCrawled = new Crawler().Crawl(_snapshot);
-
- UnityEditor.EditorUtility.DisplayProgressBar("Take Snapshot", "Unpacking Snapshot...", 0.67f);
-
- Unpack();
+ _snapshot = snapshot;
+
+ UnityEditor.EditorUtility.DisplayProgressBar("Take Snapshot", "Crawling Snapshot...", 0.33f);
+ try
+ {
+ _packedCrawled = new Crawler().Crawl(_snapshot);
+
+ UnityEditor.EditorUtility.DisplayProgressBar("Take Snapshot", "Unpacking Snapshot...", 0.67f);
+
+ Unpack();
}
- finally
- {
- UnityEditor.EditorUtility.ClearProgressBar();
+ finally
+ {
+ UnityEditor.EditorUtility.ClearProgressBar();
}
}
}
--
Gitblit v1.8.0