asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CSG issues when reparenting shape nodes.

Browse source
This commit is contained in:
Benjamin 2018-06-10 17:54:42 +02:00
parent 257d3c3f39
commit 1535ffab06
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() { void CSGShape::_update_shape() {
//print_line("updating shape for " + String(get_path())); //print_line("updating shape for " + String(get_path()));
if (parent)
return;
set_base(RID()); set_base(RID());
root_mesh.unref(); //byebye root mesh root_mesh.unref(); //byebye root mesh
@ -349,6 +353,10 @@ void CSGShape::_notification(int p_what) {
Node *parentn = get_parent(); Node *parentn = get_parent();
if (parentn) { if (parentn) {
parent = Object::cast_to<CSGShape>(parentn); parent = Object::cast_to<CSGShape>(parentn);
if (parent) {
set_base(RID());
root_mesh.unref();
}
} }
if (use_collision && is_root_shape()) { if (use_collision && is_root_shape()) {
@ -371,6 +379,7 @@ void CSGShape::_notification(int p_what) {
} }
if (p_what == NOTIFICATION_EXIT_TREE) { if (p_what == NOTIFICATION_EXIT_TREE) {
if (parent) if (parent)
parent->_make_dirty(); parent->_make_dirty();
parent = NULL; parent = NULL;