Merge pull request #340 from Unity-Technologies/Uni-41549-RemovePresetForUnity2017

Uni-41549-RemovePresetForUnity2017

Author: MarcShakour

Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs

@@ -3,7 +3,9 @@
 using UnityEngine;
 using UnityEditor;
 using FbxExporters.EditorTools;
+#if UNITY_2018_1_OR_NEWER
 using UnityEditor.Presets;
+#endif
 using System.Linq;
 
 namespace FbxExporters
@@ -84,12 +86,12 @@ protected override bool DisableNameSelection ()
             {
                 return m_toConvert.Length > 1;
             }
-
+            #if UNITY_2018_1_OR_NEWER
             protected override void ShowPresetReceiver ()
             {
                 ShowPresetReceiver (ExportSettings.instance.convertToPrefabSettings);
             }
-
+            #endif
             protected override void CreateCustomUI ()
             {
                 GUILayout.BeginHorizontal ();

Assets/FbxExporters/Editor/ExportModelEditorWindow.cs

@@ -3,7 +3,9 @@
 using UnityEngine;
 using UnityEditor;
 using FbxExporters.EditorTools;
+#if UNITY_2018_1_OR_NEWER
 using UnityEditor.Presets;
+#endif
 using System.Linq;
 
 namespace FbxExporters
@@ -29,8 +31,9 @@ public abstract class ExportOptionsEditorWindow : EditorWindow
             protected string m_exportFileName = "";
 
             protected UnityEditor.Editor m_innerEditor;
+            #if UNITY_2018_1_OR_NEWER
             protected FbxExportPresetSelectorReceiver m_receiver;
-
+            #endif
             private static GUIContent presetIcon { get { return EditorGUIUtility.IconContent ("Preset.Context"); }}
             private static GUIStyle presetIconButton { get { return new GUIStyle("IconButton"); }}
 
@@ -41,8 +44,9 @@ public abstract class ExportOptionsEditorWindow : EditorWindow
             protected float m_fbxExtLabelWidth;
 
             protected virtual void OnEnable(){
+                #if UNITY_2018_1_OR_NEWER
                 InitializeReceiver ();
-
+                #endif
                 m_showOptions = true;
                 this.minSize = new Vector2 (SelectableLabelMinWidth + LabelWidth + BrowseButtonWidth, MinWindowHeight);
 
@@ -67,6 +71,7 @@ protected virtual void InitializeWindow(string filename = ""){
                 this.SetFilename (filename);
             }
 
+            #if UNITY_2018_1_OR_NEWER
             protected void InitializeReceiver(){
                 if (!m_receiver) {
                     m_receiver = ScriptableObject.CreateInstance<FbxExportPresetSelectorReceiver> () as FbxExportPresetSelectorReceiver;
@@ -76,6 +81,7 @@ protected void InitializeReceiver(){
                     m_receiver.DialogClosed += SaveExportSettings;
                 }
             }
+            #endif
 
             public void SetFilename(string filename){
                 // remove .fbx from end of filename
@@ -110,6 +116,7 @@ protected virtual bool DisableNameSelection(){
                 return false;
             }
 
+            #if UNITY_2018_1_OR_NEWER  
             protected abstract void ShowPresetReceiver ();
 
             protected void ShowPresetReceiver(UnityEngine.Object target){
@@ -118,6 +125,7 @@ protected void ShowPresetReceiver(UnityEngine.Object target){
                 m_receiver.SetInitialValue (new Preset (target));
                 UnityEditor.Presets.PresetSelector.ShowSelector(target, null, true, m_receiver);
             }
+            #endif
 
             protected void OnGUI ()
             {
@@ -126,10 +134,14 @@ protected void OnGUI ()
 
                 GUILayout.BeginHorizontal ();
                 GUILayout.FlexibleSpace ();
-                if (EditorGUILayout.DropdownButton (presetIcon, FocusType.Keyboard, presetIconButton)) {
+                
+                #if UNITY_2018_1_OR_NEWER  
+                if(EditorGUILayout.DropdownButton(presetIcon, FocusType.Keyboard, presetIconButton)){
                     ShowPresetReceiver ();
                 }
-                GUILayout.EndHorizontal ();
+                #endif
+
+                GUILayout.EndHorizontal();
 
                 EditorGUILayout.LabelField("Naming");
                 EditorGUI.indentLevel++;
@@ -364,10 +376,12 @@ protected override void Export(){
                 }
             }
 
+            #if UNITY_2018_1_OR_NEWER  
             protected override void ShowPresetReceiver ()
             {
                 ShowPresetReceiver (ExportSettings.instance.exportModelSettings);
             }
+            #endif
         }
     }
 }

Assets/FbxExporters/Editor/FbxExportPresetSelectorReceiver.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+#if UNITY_2018_1_OR_NEWER
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor.Presets;
@@ -45,4 +46,5 @@ public void SetTarget(UnityEngine.Object target){
     public void SetInitialValue(Preset initialValue){
         m_InitialValue = initialValue;
     }
-}
+}
+#endif