godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

attempt another fix

This commit is contained in:
Juan Linietsky 2016-01-13 09:10:20 -03:00
parent 5fca2bd4bc
commit 96317566c2
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/main.cpp
View File

@ -1350,6 +1350,7 @@ bool Main::start() {
} }
//second pass, load into global constants //second pass, load into global constants
List<Node*> to_add;
for(List<PropertyInfo>::Element *E=props.front();E;E=E->next()) { for(List<PropertyInfo>::Element *E=props.front();E;E=E->next()) {
String s = E->get().name; String s = E->get().name;
@ -1389,7 +1390,9 @@ bool Main::start() {
ERR_CONTINUE(!n); ERR_CONTINUE(!n);
n->set_name(name); n->set_name(name);
sml->get_root()->add_child(n); //defer so references are all valid on _ready()
//sml->get_root()->add_child(n);
to_add.push_back(n);
if (global_var) { if (global_var) {
for(int i=0;i<ScriptServer::get_language_count();i++) { for(int i=0;i<ScriptServer::get_language_count();i++) {
@ -1399,6 +1402,13 @@ bool Main::start() {
} }
for(List<Node*>::Element *E=to_add.front();E;E=E->next()) {
sml->get_root()->add_child(E->get());
}
} }
Node *scene=NULL; Node *scene=NULL;