BlackMATov/unity-flash-tools
1
0
Fork 0
mirror of https://github.com/BlackMATov/unity-flash-tools.git synced 2025-12-13 03:30:14 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix preview shutdown warning

Browse Source
This commit is contained in:
Matvey Cherevko
2018-10-29 23:06:51 +07:00
parent 853da8be02
commit 9217dee8c2
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -2,6 +2,7 @@ obj/*
Temp/*
Library/*
.vs/*
FTSources/.vs/*
FTSources/FTEditor/obj/*
FTSources/FTRuntime/obj/*

11
Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfClipAssetPreview.cs
View File

@@ -8,9 +8,9 @@ using FTRuntime;
namespace FTEditor.Editors {
[CustomPreview(typeof(SwfClipAsset))]
class SwfClipAssetPreview : ObjectPreview {
int _sequence = 0;
static MaterialPropertyBlock _matPropBlock = null;
static PreviewRenderUtility _previewUtils = null;
int _sequence = 0;
MaterialPropertyBlock _matPropBlock = null;
PreviewRenderUtility _previewUtils = null;
Sprite targetSprite {
get {
@@ -142,6 +142,11 @@ namespace FTEditor.Editors {
: 0;
}
public void Shutdown() {
_matPropBlock.Clear();
_previewUtils.Cleanup();
}
// ---------------------------------------------------------------------
//
// Messages

27
Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfClipEditor.cs
View File

@@ -131,7 +131,7 @@ namespace FTEditor.Editors {
}
void SetupPreviews() {
_previews.Clear();
ShutdownPreviews();
foreach ( var clip in _clips.Where(p => !!p.clip) ) {
var preview = new SwfClipAssetPreview();
preview.Initialize(new Object[]{clip.clip});
@@ -139,18 +139,29 @@ namespace FTEditor.Editors {
}
}
// ---------------------------------------------------------------------
//
// Messages
//
// ---------------------------------------------------------------------
void ShutdownPreviews() {
foreach ( var p in _previews ) {
p.Value.Shutdown();
}
_previews.Clear();
}
void OnEnable() {
// ---------------------------------------------------------------------
//
// Messages
//
// ---------------------------------------------------------------------
void OnEnable() {
_clips = targets.OfType<SwfClip>().ToList();
SetupPreviews();
}
public override void OnInspectorGUI() {
void OnDisable() {
ShutdownPreviews();
}
public override void OnInspectorGUI() {
serializedObject.Update();
DrawDefaultInspector();
DrawSequence();