From 8ce88d38f22ae376cebbd908f15b8c5bf77a9b59 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

(cherry picked from commit 001b6075cb148d2300cbbf1e65c6b7cae19b3b25)
---
 modules/csg/csg_shape.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp
index bc2d037d401..93dc171ec13 100644
--- a/modules/csg/csg_shape.cpp
+++ b/modules/csg/csg_shape.cpp
@@ -655,8 +655,7 @@ CSGShape::~CSGShape() {
 //////////////////////////////////
 
 CSGBrush *CSGCombiner::_build_brush() {
-
-	return NULL; //does not build anything
+	return memnew(CSGBrush); //does not build anything
 }
 
 CSGCombiner::CSGCombiner() {