1 files changed, 4 insertions, 9 deletions
diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp
index 6d99392485..8f2ebc7232 100644
--- a/modules/csg/csg_shape.cpp
+++ b/modules/csg/csg_shape.cpp
@@ -132,18 +132,13 @@ void CSGShape3D::_make_dirty() {
 		return;
 	}
 
-	if (dirty) {
-		return;
-	}
-
-	dirty = true;
-
 	if (parent) {
 		parent->_make_dirty();
-	} else {
-		//only parent will do
+	} else if (!dirty) {
 		call_deferred("_update_shape");
 	}
+
+	dirty = true;
 }
 
 CSGBrush *CSGShape3D::_get_brush() {
@@ -652,7 +647,7 @@ CSGShape3D::~CSGShape3D() {
 //////////////////////////////////
 
 CSGBrush *CSGCombiner3D::_build_brush() {
-	return nullptr; //does not build anything
+	return memnew(CSGBrush); //does not build anything
 }
 
 CSGCombiner3D::CSGCombiner3D() {