Merge branch 'master' into no-presenters

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/AbstractMaterialGraphEditWindow.cs

             if (graph == null)
                 return;
 
-            File.WriteAllText(path, EditorJsonUtility.ToJson(graphObject, true));
+            File.WriteAllText(path, EditorJsonUtility.ToJson(graph, true));
             AssetDatabase.ImportAsset(path);
         }
 
                 textures.Add(texture);
             }
             shaderImporter.SetNonModifiableTextures(textureNames.ToArray(), textures.ToArray());
-            File.WriteAllText(path, EditorJsonUtility.ToJson(graphObject, true));
+            File.WriteAllText(path, EditorJsonUtility.ToJson(graph, true));
             shaderImporter.SaveAndReimport();
             AssetDatabase.ImportAsset(path);
         }