Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Freixas <mfreixas@lsi.upc.edu>2005-11-30 20:38:41 +0300
committerMarc Freixas <mfreixas@lsi.upc.edu>2005-11-30 20:38:41 +0300
commitce3164e259fd93930532a18153cf98424e8abb10 (patch)
tree628b016a64c44cdda0604c4a506bd4adcc47f4be /source/blender
parent738d3e4ae3190b577190dc74d8cd3746115e3614 (diff)
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"
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/src/booleanops.c2
-rw-r--r--source/blender/src/editobject.c4
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);