From 001b6075cb148d2300cbbf1e65c6b7cae19b3b25 Mon Sep 17 00:00:00 2001
From: hoontee <5272529+hoontee@users.noreply.github.com>
Date: Fri, 31 Jul 2020 10:11:26 -0500
Subject: [PATCH] Properly handle empty CSGCombiners

---
 modules/csg/csg_shape.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp
index cea006364f1..66538493847 100644
--- a/modules/csg/csg_shape.cpp
+++ b/modules/csg/csg_shape.cpp
@@ -646,7 +646,7 @@ CSGShape3D::~CSGShape3D() {
 //////////////////////////////////
 
 CSGBrush *CSGCombiner3D::_build_brush() {
-	return nullptr; //does not build anything
+	return memnew(CSGBrush); //does not build anything
 }
 
 CSGCombiner3D::CSGCombiner3D() {