tiennm99/godot
1
0
Fork 0
mirror of https://github.com/tiennm99/godot.git synced 2026-07-19 10:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

-fixes and more fixes to new scene system, seems stable now..

Browse Source 
BUT DONT TRUST ME IT MAY STILL BREAK, USE WITH CARE!!
This commit is contained in:
reduz
2015-10-16 19:11:23 -03:00
parent 6b20ee4324
commit 078a474135
10 changed files with 210 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/main/node.cpp
+8 -4
View File
@@ -1052,6 +1052,7 @@ void Node::get_owned_by(Node *p_by,List<Node*> *p_owned) {
void Node::_set_owner_nocheck(Node* p_owner) {
ERR_FAIL_COND(data.owner);
data.owner=p_owner;
data.owner->data.owned.push_back( this );
data.OW = data.owner->data.owned.back();
@@ -1443,13 +1444,14 @@ Ref<SceneState> Node::get_scene_inherited_state() const{
return data.inherited_state;
}
Vector<StringName> Node::get_instance_groups() const {
void Node::set_scene_instance_load_placeholder(bool p_enable) {
return data.instance_groups;
data.use_placeholder=p_enable;
}
Vector<Node::Connection> Node::get_instance_connections() const{
return data.instance_connections;
bool Node::get_scene_instance_load_placeholder() const{
return data.use_placeholder;
}
int Node::get_position_in_parent() const {
@@ -2109,6 +2111,7 @@ Node::Node() {
data.parent_owned=false;
data.in_constructor=true;
data.viewport=NULL;
data.use_placeholder=false;
}
Node::~Node() {
@@ -2125,3 +2128,4 @@ Node::~Node() {
}
////////////////////////////////