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

Bug #1459

Browse Source 
New buttons in editmode for mball forgot to check on NULL pointer.
This commit is contained in:
Ton Roosendaal
2004-07-21 17:44:44 +00:00
parent 5c4e6908e7
commit db4941128e
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/blender/src/drawview.c
View File

@@ -1293,24 +1293,26 @@ static void v3d_editarmature_buts(uiBlock *block, Object *ob, float lim)
static void v3d_editmetaball_buts(uiBlock *block, Object *ob, float lim) static void v3d_editmetaball_buts(uiBlock *block, Object *ob, float lim)
{ {
extern MetaElem *lastelem; extern MetaElem *lastelem;
uiBlockBeginAlign(block); if(lastelem) {
uiDefButF(block, NUM, B_RECALCMBALL, "LocX:", 10, 70, 140, 19, &lastelem->x, -lim, lim, 100, 3, ""); uiBlockBeginAlign(block);
uiDefButF(block, NUM, B_RECALCMBALL, "LocY:", 10, 50, 140, 19, &lastelem->y, -lim, lim, 100, 3, ""); uiDefButF(block, NUM, B_RECALCMBALL, "LocX:", 10, 70, 140, 19, &lastelem->x, -lim, lim, 100, 3, "");
uiDefButF(block, NUM, B_RECALCMBALL, "LocZ:", 10, 30, 140, 19, &lastelem->z, -lim, lim, 100, 3, ""); uiDefButF(block, NUM, B_RECALCMBALL, "LocY:", 10, 50, 140, 19, &lastelem->y, -lim, lim, 100, 3, "");
uiDefButF(block, NUM, B_RECALCMBALL, "LocZ:", 10, 30, 140, 19, &lastelem->z, -lim, lim, 100, 3, "");
uiBlockBeginAlign(block);
if(lastelem->type!=MB_BALL) uiBlockBeginAlign(block);
uiDefButF(block, NUM, B_RECALCMBALL, "dx:", 160, 70, 140, 19, &lastelem->expx, 0, lim, 100, 3, ""); if(lastelem->type!=MB_BALL)
if((lastelem->type!=MB_BALL) && (lastelem->type!=MB_TUBE)) uiDefButF(block, NUM, B_RECALCMBALL, "dx:", 160, 70, 140, 19, &lastelem->expx, 0, lim, 100, 3, "");
uiDefButF(block, NUM, B_RECALCMBALL, "dy:", 160, 50, 140, 19, &lastelem->expy, 0, lim, 100, 3, ""); if((lastelem->type!=MB_BALL) && (lastelem->type!=MB_TUBE))
if((lastelem->type==MB_ELIPSOID) || (lastelem->type==MB_CUBE)) uiDefButF(block, NUM, B_RECALCMBALL, "dy:", 160, 50, 140, 19, &lastelem->expy, 0, lim, 100, 3, "");
uiDefButF(block, NUM, B_RECALCMBALL, "dz:", 160, 30, 140, 19, &lastelem->expz, 0, lim, 100, 3, ""); if((lastelem->type==MB_ELIPSOID) || (lastelem->type==MB_CUBE))
uiDefButF(block, NUM, B_RECALCMBALL, "dz:", 160, 30, 140, 19, &lastelem->expz, 0, lim, 100, 3, "");
uiBlockEndAlign(block);
uiBlockEndAlign(block);
uiDefButF(block, NUM, B_RECALCMBALL, "Stiffness:", 10, 100, 140, 19, &lastelem->s, 0, lim, 100, 3, "");
uiDefButF(block, NUM, B_RECALCMBALL, "Stiffness:", 10, 100, 140, 19, &lastelem->s, 0, lim, 100, 3, "");
}
} }
void do_viewbuts(unsigned short event) void do_viewbuts(unsigned short event)

4
source/blender/src/editobject.c
View File

@@ -85,10 +85,10 @@
#include "BLI_editVert.h" #include "BLI_editVert.h"
#include "BLI_ghash.h" #include "BLI_ghash.h"
#include "BKE_nla.h"
#include "BKE_utildefines.h" #include "BKE_utildefines.h"
#include "BKE_anim.h" #include "BKE_anim.h"
#include "BKE_blender.h" #include "BKE_blender.h"
#include "BKE_booleanops.h"
#include "BKE_curve.h" #include "BKE_curve.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_effect.h" #include "BKE_effect.h"
@@ -103,13 +103,13 @@
#include "BKE_material.h" #include "BKE_material.h"
#include "BKE_mball.h" #include "BKE_mball.h"
#include "BKE_mesh.h" #include "BKE_mesh.h"
#include "BKE_nla.h"
#include "BKE_object.h" #include "BKE_object.h"
#include "BKE_property.h" #include "BKE_property.h"
#include "BKE_sca.h" #include "BKE_sca.h"
#include "BKE_scene.h" #include "BKE_scene.h"
#include "BKE_subsurf.h" #include "BKE_subsurf.h"
#include "BKE_texture.h" #include "BKE_texture.h"
#include "BKE_booleanops.h"
#include "BIF_gl.h" #include "BIF_gl.h"
#include "BIF_graphics.h" #include "BIF_graphics.h"