griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bugfix #6456

Browse Source 
Boolean modifier on its own object crashes. Easy to prevent this user error
This commit is contained in:
Ton Roosendaal
2007-03-29 08:34:03 +00:00
parent bcaea04fde
commit 1cc445e7ea
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/src/buttons_editing.c
View File

@@ -1076,16 +1076,19 @@ static void modifier_testMeshObj(char *name, ID **idpp)
ID *id;
for (id= G.main->object.first; id; id= id->next) {
if( strcmp(name, id->name+2)==0 ) {
if (((Object *)id)->type != OB_MESH) {
error ("Boolean modifier object must be a mesh");
break;
}
*idpp= id;
return;
/* no boolean on its own object */
if(id != (ID *)OBACT) {
if( strcmp(name, id->name+2)==0 ) {
if (((Object *)id)->type != OB_MESH) {
error ("Boolean modifier object must be a mesh");
break;
}
*idpp= id;
return;
}
}
}
*idpp= 0;
*idpp= NULL;
}
static void modifier_testArmatureObj(char *name, ID **idpp)