Merge branch 'fastgltf'

2026-03-12 20:08:43 +01:00
parent ed1dc1eed9 9f83ac816a
commit fec9286dee
6 changed files with 55 additions and 14 deletions
--- a/editor/include/editor.hpp
+++ b/editor/include/editor.hpp
@@ -10,6 +10,7 @@
 #include "open_engine/renderer/renderer3d.hpp"
 #include "open_engine/scene/components.hpp"
 #include "panels/content_browser.hpp"
+#include "panels/models_panel.hpp"
 #include "panels/scene_hierarchy.hpp"

 #include <Jolt/Physics/Collision/Shape/Shape.h>
@@ -585,6 +586,7 @@ namespace OpenEngine {
                DrawStats();
                scene_hierarchy.OnImGuiRender();
                browser.OnImGuiRender();
+                ModelsPanelOnImGuiRender();
                DrawViewport();
                DrawPlayBar();