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/ScriptEditor/TextImageEditor.cs | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Assets/Editor/ScriptEditor/TextImageEditor.cs b/Assets/Editor/ScriptEditor/TextImageEditor.cs
index b1c15c2..6e589e5 100644
--- a/Assets/Editor/ScriptEditor/TextImageEditor.cs
+++ b/Assets/Editor/ScriptEditor/TextImageEditor.cs
@@ -4,24 +4,24 @@
using UnityEditor;
[CustomEditor(typeof(TextImage), true), CanEditMultipleObjects]
-public class TextImageEditor : TextExEditor
+public class TextImageEditor : TextExEditor
{
- SerializedProperty sprite;
- protected override void OnEnable()
- {
- base.OnEnable();
- sprite = serializedObject.FindProperty("m_Sprite");
+ SerializedProperty sprite;
+ protected override void OnEnable()
+ {
+ base.OnEnable();
+ sprite = serializedObject.FindProperty("m_Sprite");
}
- public override void OnInspectorGUI()
- {
- base.OnInspectorGUI();
- EditorGUILayout.Space();
-
- EditorGUILayout.PropertyField(sprite);
- base.serializedObject.ApplyModifiedProperties();
- }
-
-
+ public override void OnInspectorGUI()
+ {
+ base.OnInspectorGUI();
+ EditorGUILayout.Space();
+
+ EditorGUILayout.PropertyField(sprite);
+ base.serializedObject.ApplyModifiedProperties();
+ }
+
+
}
--
Gitblit v1.8.0