hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/gles3' into gles3-on-master

Browse source 
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
This commit is contained in:
Rémi Verschelde 2017-01-02 21:38:20 +01:00
commit 3f3f5a5359
287 changed files with 59481 additions and 17904 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scene/main/node.cpp
View file

@ -316,6 +316,12 @@ void Node::move_child(Node *p_child,int p_pos) {
}
if (p_child->data.pos==p_pos)
return; //do nothing
int motion_from = MIN(p_pos,p_child->data.pos);
int motion_to = MAX(p_pos,p_child->data.pos);
data.children.remove( p_child->data.pos );
data.children.insert( p_pos, p_child );
@ -325,13 +331,13 @@ void Node::move_child(Node *p_child,int p_pos) {
data.blocked++;
//new pos first
for (int i=0;i<data.children.size();i++) {
for (int i=motion_from;i<=motion_to;i++) {
data.children[i]->data.pos=i;
}
// notification second
move_child_notify(p_child);
for (int i=0;i<data.children.size();i++) {
for (int i=motion_from;i<=motion_to;i++) {
data.children[i]->notification( NOTIFICATION_MOVED_IN_PARENT );
}