diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-08-11 11:57:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 11:57:18 +0200 |
| commit | 920f8c86ec7fe6172365b89a7c290af956e8e8e3 (patch) | |
| tree | bf228ff955d4fd8ecf72eebbe56c014db0e5f469 | |
| parent | 7ecffe59c9c7e56d4e77b7a67f261266df4007f5 (diff) | |
| parent | 001b6075cb148d2300cbbf1e65c6b7cae19b3b25 (diff) | |
Merge pull request #40919 from hoontee/master-2
Properly handle empty CSGCombiners
| -rw-r--r-- | modules/csg/csg_shape.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp index 82a47f594b..a10e03b3b2 100644 --- 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() { |