changed AssetDatabase.SaveAssets() to AssetDatabase.Refresh()

Author: jasonm-unity

source/FrameRecorder/Core/Editor/RTInputSelector.cs

@@ -7,12 +7,14 @@ namespace UnityEditor.FrameRecorder
 {
     public class RTInputSelector
     {
-        public string title { get; set; }
+        string title { get; set; }
+        bool enforceEvenSize { get; set; }
         string[] candidates = { "Camera output", "Offscreen rendering", "Render Texture" };
 
-        public RTInputSelector(string title)
+        public RTInputSelector(string title, bool enforceEvenSize )
         {
             this.title = title;
+            this.enforceEvenSize = enforceEvenSize;
         }
 
         public bool OnInputGui( ref RecorderInputSetting input)
@@ -39,6 +41,12 @@ public bool OnInputGui( ref RecorderInputSetting input)
                 var newSettings = ScriptableObject.CreateInstance(newType) as RecorderInputSetting;
                 newSettings.m_DisplayName = title;
                 input = newSettings;
+
+                if (newSettings is CBRenderTextureInputSettings)
+                    (newSettings as CBRenderTextureInputSettings).m_PadSize = enforceEvenSize;
+                if (newSettings is AdamBeautyInputSettings)
+                    (newSettings as AdamBeautyInputSettings).m_ForceEvenSize = enforceEvenSize;
+
                 return true;
             }
 

source/FrameRecorder/Core/Editor/RecorderEditor.cs

@@ -135,7 +135,7 @@ protected void AddSourceSettings(RecorderInputSetting sourceSettings)
             sourceSettings.name = GUID.Generate().ToString();
 
             AssetDatabase.AddObjectToAsset(sourceSettings, serializedObject.targetObject);
-            AssetDatabase.SaveAssets();
+            AssetDatabase.Refresh();
 
             m_Inputs.InsertArrayElementAtIndex(m_Inputs.arraySize);
             var arryItem = m_Inputs.GetArrayElementAtIndex(m_Inputs.arraySize-1);
@@ -153,7 +153,7 @@ public void ChangeInputSettings(int atIndex, RecorderInputSetting newSettings)
                 newSettings.name = GUID.Generate().ToString();
 
                 AssetDatabase.AddObjectToAsset(newSettings, serializedObject.targetObject);
-                AssetDatabase.SaveAssets();
+                AssetDatabase.Refresh();
 
                 var arryItem = m_Inputs.GetArrayElementAtIndex(atIndex);
                 UnityHelpers.Destroy(arryItem.objectReferenceValue, true);

source/FrameRecorder/Core/Editor/RecorderWindow.cs

@@ -78,7 +78,7 @@ public void OnGUI()
                             {
                                 m_WindowSettingsAsset = ScriptableObject.CreateInstance<RecorderWindowSettings>();
                                 AssetDatabase.CreateAsset(m_WindowSettingsAsset, "Assets/FrameRecordingSettings.asset");
-                                AssetDatabase.SaveAssets();
+                                AssetDatabase.Refresh();
                             }
                         }
 
@@ -291,7 +291,7 @@ public void OnRecorderSelected()
             if( m_WindowSettingsAsset.m_Settings == null )
                 m_WindowSettingsAsset.m_Settings = RecordersInventory.GenerateNewSettingsAsset(m_WindowSettingsAsset, m_recorderSelector.selectedRecorder );
             m_Editor = Editor.CreateEditor( m_WindowSettingsAsset.m_Settings ) as RecorderEditor;
-            AssetDatabase.SaveAssets();
+            AssetDatabase.Refresh();
 
         }
 

source/FrameRecorder/Core/Editor/Timeline/RecorderClipEditor.cs

@@ -81,7 +81,7 @@ public void OnRecorderSelected()
             if(clip.m_Settings == null)
                 clip.m_Settings = RecordersInventory.GenerateNewSettingsAsset(clip, m_recorderSelector.selectedRecorder );
             m_Editor = Editor.CreateEditor(clip.m_Settings) as RecorderEditor;
-            AssetDatabase.SaveAssets();
+            AssetDatabase.Refresh();
         }
 
         TimelineAsset FindTimelineAsset()

source/FrameRecorder/Core/Engine/RecordersInventory.cs

@@ -188,7 +188,7 @@ public static RecorderSettings GenerateNewSettingsAsset(UnityEngine.Object paren
                 settings.recorderType = recorderType;
 
                 AssetDatabase.AddObjectToAsset(settings, parentAsset);
-                AssetDatabase.SaveAssets();
+                AssetDatabase.Refresh();
                 return settings;
             }
             else

source/FrameRecorder/Inputs/Adam/Engine/AdamBeautyInput.cs

@@ -112,7 +112,12 @@ public override void BeginRecording(RecordingSession session)
             m_renderHeight = (int)adamSettings.m_RenderSize;
             m_renderWidth = Mathf.Min(16 * 1024, Mathf.RoundToInt(m_renderHeight * aspect));
             m_outputHeight = (int)adamSettings.m_FinalSize;
-            m_outputWidth = Mathf.Min(16 * 1024, Mathf.RoundToInt(m_outputHeight * aspect)) & ~1;
+            m_outputWidth = Mathf.Min(16 * 1024, Mathf.RoundToInt(m_outputHeight * aspect));
+            if (adamSettings.m_ForceEvenSize)
+            {
+                m_outputWidth &= ~1;
+                m_outputHeight &= ~1;
+            }
 
             m_superMaterial = new Material(superShader);
             m_superMaterial.hideFlags = HideFlags.DontSave;

source/FrameRecorder/Inputs/Adam/Engine/AdamBeautyInputSettings.cs

@@ -11,6 +11,7 @@ public class AdamBeautyInputSettings : InputSettings<AdamBeautyInput>
         public float m_SuperKernelScale = 1f;
         public RenderTexture m_RenderTexture;
         public string m_CameraTag;
+        public bool m_ForceEvenSize = false;
 
         public AdamBeautyInputSettings()
         {

source/FrameRecorder/Recorders/ImageRecorder/Editor/ImageRecorderEditor.cs

@@ -24,7 +24,7 @@ protected override void OnEnable()
             if (target == null)
                 return;
 
-            m_RTInputSelector = new RTInputSelector("Pixels");
+            m_RTInputSelector = new RTInputSelector("Pixels", false);
 
             var pf = new PropertyFinder<ImageRecorderSettings>(serializedObject);
             m_Inputs = pf.Find(w => w.m_SourceSettings);