Bläddra i källkod

Properly handle empty CSGCombiners

(cherry picked from commit 001b6075cb148d2300cbbf1e65c6b7cae19b3b25)
hoontee 5 år sedan
förälder
incheckning
8ce88d38f2
1 ändrade filer med 1 tillägg och 2 borttagningar
  1. 1 2
      modules/csg/csg_shape.cpp

+ 1 - 2
modules/csg/csg_shape.cpp

@@ -655,8 +655,7 @@ CSGShape::~CSGShape() {
 //////////////////////////////////
 //////////////////////////////////
 
 
 CSGBrush *CSGCombiner::_build_brush() {
 CSGBrush *CSGCombiner::_build_brush() {
-
-	return NULL; //does not build anything
+	return memnew(CSGBrush); //does not build anything
 }
 }
 
 
 CSGCombiner::CSGCombiner() {
 CSGCombiner::CSGCombiner() {