archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

applied Matt Ebb's patch for the infoeditmenu:

Browse Source 
"This patch checks what type of object is selected first and gives an error
message rather than crashing."
This commit is contained in:
Rob Haarsma
2003-05-11 14:10:37 +00:00
parent fbca17dfa7
commit 713f048f73
1 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
source/blender/src/headerbuttons.c
View File

@@ -2709,6 +2709,13 @@ static uiBlock *info_filemenu(void *arg_unused)
static void do_info_editmenu(void *arg, int event)
{
/* needed to check for valid selected objects */
Base *base;
Object *ob;
base= BASACT;
ob= base->object;
switch(event) {
case 0:
@@ -2763,32 +2770,49 @@ static void do_info_editmenu(void *arg, int event)
break;
case 9:
/* Shear */
if (!G.obedit) {
enter_editmode();
/* ### put these into a deselectall_gen() */
if(G.obedit->type==OB_MESH) deselectall_mesh();
else if ELEM(G.obedit->type, OB_CURVE, OB_SURF) deselectall_nurb();
else if(G.obedit->type==OB_MBALL) deselectall_mball();
else if(G.obedit->type==OB_LATTICE) deselectall_Latt();
/* ### */
}
/* check that a valid object is selected to prevent crash */
if ((ob->type==OB_LAMP) || (ob->type==OB_EMPTY) || (ob->type==OB_FONT) || (ob->type==OB_CAMERA)) {
error("Only editable 3D objects can be sheared");
}
else {
if (!G.obedit) {
enter_editmode();
/* ### put these into a deselectall_gen() */
if(G.obedit->type==OB_MESH) deselectall_mesh();
else if ELEM(G.obedit->type, OB_CURVE, OB_SURF) deselectall_nurb();
else if(G.obedit->type==OB_MBALL) deselectall_mball();
else if(G.obedit->type==OB_LATTICE) deselectall_Latt();
else if(G.obedit->type==OB_ARMATURE) deselectall_armature();
/* ### */
}
if(select_area(SPACE_VIEW3D)) {
transform('S');
}
}
if(select_area(SPACE_VIEW3D)) {
transform('S');
}
break;
case 10:
/* Warp/Bend */
if (!G.obedit) {
enter_editmode();
/* ### put these into a deselectall_gen() */
if(G.obedit->type==OB_MESH) deselectall_mesh();
else if ELEM(G.obedit->type, OB_CURVE, OB_SURF) deselectall_nurb();
else if(G.obedit->type==OB_MBALL) deselectall_mball();
else if(G.obedit->type==OB_LATTICE) deselectall_Latt();
/* ### */
}
if(select_area(SPACE_VIEW3D)) {
transform('w');
/* check that a valid object is selected to prevent crash */
if ((ob->type==OB_LAMP) || (ob->type==OB_EMPTY) || (ob->type==OB_FONT) || (ob->type==OB_CAMERA)) {
error("Only editable 3D objects can be warped");
}
else {
if (!G.obedit) {
enter_editmode();
/* ### put these into a deselectall_gen() */
if(G.obedit->type==OB_MESH) deselectall_mesh();
else if ELEM(G.obedit->type, OB_CURVE, OB_SURF) deselectall_nurb();
else if(G.obedit->type==OB_MBALL) deselectall_mball();
else if(G.obedit->type==OB_LATTICE) deselectall_Latt();
else if(G.obedit->type==OB_ARMATURE) deselectall_armature();
/* ### */
}
if(select_area(SPACE_VIEW3D)) {
transform('w');
}
}
break;
case 11: