Skip to content

Commit

Permalink
[Editor] Do not load StrideDefaultAssetsPlugin from module.
Browse files Browse the repository at this point in the history
It currently hardcodes loading the templates from a package which causes some tests to fail.

Partially reverts c98c72e
  • Loading branch information
Kryptos-FR committed Mar 2, 2024
1 parent 685eae8 commit e558a3e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
6 changes: 2 additions & 4 deletions sources/editor/Stride.Assets.Presentation/Module.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@
using Stride.Assets.Entities;
using Stride.Assets.Presentation.Templates;
using Stride.Assets.SpriteFont;
using Stride.Rendering;
using Stride.Rendering.Materials;
using Stride.Core.Assets.Editor.Services;
using Stride.Editor.Preview;
using Stride.Editor.Preview.View;
using Stride.Rendering;
using Stride.Rendering.Materials;

namespace Stride.Assets.Presentation
{
Expand All @@ -29,7 +28,6 @@ public static void Initialize()
// We need access to the AssetQuantumRegistry from the SessionTemplateGenerator so for now we register graph types in the module initializer.
AssetQuantumRegistry.RegisterAssembly(typeof(Module).Assembly);
AssetPreview.DefaultViewType = typeof(StridePreviewView);
AssetsPlugin.RegisterPlugin(typeof(StrideDefaultAssetsPlugin));
// Register default template
StrideTemplates.Register();
// Initialize translation
Expand Down
3 changes: 1 addition & 2 deletions sources/editor/Stride.GameStudio/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,7 @@ private static async void Startup(UFile initialSessionPath)
var mru = new MostRecentlyUsedFileCollection(InternalSettings.LoadProfileCopy, InternalSettings.MostRecentlyUsedSessions, InternalSettings.WriteFile);
mru.LoadFromSettings();
var editor = new GameStudioViewModel(serviceProvider, mru);
// HACK force loading the default plugin first
var _ = typeof(StrideDefaultAssetsPlugin).Name; // FIXME load plugin assemblies from folders in a defined order (config file?)
AssetsPlugin.RegisterPlugin(typeof(StrideDefaultAssetsPlugin));
AssetsPlugin.RegisterPlugin(typeof(StrideEditorPlugin));

// Attempt to load the startup session, if available
Expand Down

0 comments on commit e558a3e

Please sign in to comment.