Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update RTLTextMeshProEditor.cs #138

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update RTLTextMeshProEditor.cs #138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Assets/RTLTMPro/Scripts/Editor/RTLTextMeshProEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
using UnityEditor;
using UnityEngine;

#if TMP_VERSION_2_1_0_OR_NEWER
using TMP_UiEditorPanel = TMPro.EditorUtilities.TMP_EditorPanelUI;
#else
using TMP_UiEditorPanel = TMPro.EditorUtilities.TMP_UiEditorPanel;
#endif
// Creates issues in Unity 6
//#if TMP_VERSION_2_1_0_OR_NEWER
//using TMP_UiEditorPanel = TMPro.EditorUtilities.TMP_EditorPanelUI;
//#else
//using TMP_UiEditorPanel = TMPro.EditorUtilities.TMP_UiEditorPanel;
//#endif

namespace RTLTMPro
{
Expand Down Expand Up @@ -110,4 +111,4 @@ protected virtual void ListenForZeroWidthNoJoiner()
Repaint();
}
}
}
}