From 1535ffab06dcc6d7ad19eccc1b7b49c3d82bd5de Mon Sep 17 00:00:00 2001 From: Benjamin Date: Sun, 10 Jun 2018 17:54:42 +0200 Subject: Fix CSG issues when reparenting shape nodes. --- modules/csg/csg_shape.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'modules/csg') diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp index 82db1871da..ba27d6839d 100644 --- a/modules/csg/csg_shape.cpp +++ b/modules/csg/csg_shape.cpp @@ -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(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; -- cgit v1.2.3