maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #19489 from Nallebeorn/csg-reparent

Browse source 
Fix CSG issues when reparenting shape nodes.
This commit is contained in:
Rémi Verschelde 2018-06-11 09:19:06 +02:00 committed by GitHub
parent acd9646ede 1535ffab06
commit 1319f3852d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/csg/csg_shape.cpp
View file

@ -162,6 +162,10 @@ CSGBrush *CSGShape::_get_brush() {
void CSGShape::_update_shape() {
//print_line("updating shape for " + String(get_path()));
if (parent)
return;
set_base(RID());
root_mesh.unref(); //byebye root mesh
@ -349,6 +353,10 @@ void CSGShape::_notification(int p_what) {
Node *parentn = get_parent();
if (parentn) {
parent = Object::cast_to<CSGShape>(parentn);
if (parent) {
set_base(RID());
root_mesh.unref();
}
}
if (use_collision && is_root_shape()) {
@ -371,6 +379,7 @@ void CSGShape::_notification(int p_what) {
}
if (p_what == NOTIFICATION_EXIT_TREE) {
if (parent)
parent->_make_dirty();
parent = NULL;