mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-07 20:11:50 +00:00
Merge branch 'main' into render-update
This commit is contained in:
commit
ad07ec61cd
19 changed files with 151 additions and 34 deletions
|
|
@ -67,7 +67,7 @@ std::unique_ptr<UiDocument> UiDocument::read(
|
|||
? scripting::create_doc_environment(scripting::get_root_environment(), name)
|
||||
: scripting::create_doc_environment(penv, name);
|
||||
|
||||
gui::UiXmlReader reader(gui, env);
|
||||
gui::UiXmlReader reader(gui, scriptenv(env));
|
||||
auto view = reader.readXML(file.string(), *xmldoc->getRoot());
|
||||
view->setId("root");
|
||||
uidocscript script {};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue