From ce3164e259fd93930532a18153cf98424e8abb10 Mon Sep 17 00:00:00 2001
From: Marc Freixas <mfreixas@lsi.upc.edu>
Date: Wed, 30 Nov 2005 17:38:41 +0000
Subject: [PATCH] Boolean op error handling has been added. When a no closed
 mesh is used the follow message is showed: "Both meshes must be a closed
 mesh"

---
 source/blender/src/booleanops.c | 2 +-
 source/blender/src/editobject.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/blender/src/booleanops.c b/source/blender/src/booleanops.c
index 414ea4a5d57..1b1d5705ab9 100644
--- a/source/blender/src/booleanops.c
+++ b/source/blender/src/booleanops.c
@@ -694,7 +694,7 @@ NewBooleanMesh(
 			);
 		}
 		
-		if (success) {
+		if (success==1) {
 			// descriptions of the output;
 			CSG_VertexIteratorDescriptor vd_o;
 			CSG_FaceIteratorDescriptor fd_o;
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index a7a8ba0c5a6..811dbd79f23 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -2022,9 +2022,11 @@ void special_editmenu(void)
 								waitcursor(1);
 								ret = NewBooleanMesh(BASACT,base_select,nr);
 								if (ret==0) {
-									error("An internal error occurred -- sorry!");
+									error("An internal error occurred");
 								} else if(ret==-1) {
 									error("Selected meshes must have faces to perform boolean operations");
+								} else if (ret==-2) {
+									error("Both meshes must be a closed mesh");
 								}
 								else BIF_undo_push("Boolean");
 								waitcursor(0);