Merge pull request #40919 from hoontee/master-2

Properly handle empty CSGCombiners
2020-08-11 11:57:18 +02:00
parent 7ecffe59c9 001b6075cb
commit 920f8c86ec
1 changed files with 1 additions and 1 deletions
--- a/modules/csg/csg_shape.cpp
+++ b/modules/csg/csg_shape.cpp
@ -641,7 +641,7 @@ CSGShape3D::~CSGShape3D() {
 //////////////////////////////////

 CSGBrush *CSGCombiner3D::_build_brush() {
-	return nullptr; //does not build anything
+	return memnew(CSGBrush); //does not build anything
 }

 CSGCombiner3D::CSGCombiner3D() {