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

Bugfix #3358

Browse Source 
Deleting a shape key object could crash, when ipowindow open and showing an
active key.

Also: patch from tracker to increase limits of buttons for background image
offset.
This commit is contained in:
Ton Roosendaal
2005-11-06 19:02:14 +00:00
parent dfce9d7d9b
commit 25dc3355f4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/src/drawipo.c
View File

@@ -967,7 +967,7 @@ static void draw_ipobuts(SpaceIpo *sipo)
ei= sipo->editipo;
y= area->winy-30+sipo->butofs;
if(sipo->blocktype==ID_KE) {
if(ob && sipo->blocktype==ID_KE) {
int icon;
if(ob->shapeflag & OB_SHAPE_LOCK) icon= ICON_PIN_HLT; else icon= ICON_PIN_DEHLT;
uiDefIconButBitC(block, TOG, OB_SHAPE_LOCK, B_SETKEY, icon,

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

@@ -1925,8 +1925,8 @@ static void view3d_panel_background(short cntrl) // VIEW3D_HANDLER_BACKGROUND
uiDefButF(block, NUM, REDRAWVIEW3D, "Size:", 0, 28, 140, 19, &vd->bgpic->size, 0.1, 250.0, 100, 0, "Set the size (width) of the background image");
uiDefButF(block, NUM, REDRAWVIEW3D, "X Offset:", 0, 6, 140, 19, &vd->bgpic->xof, -20.0,20.0, 10, 2, "Set the horizontal offset of the background image");
uiDefButF(block, NUM, REDRAWVIEW3D, "Y Offset:", 150, 6, 140, 19, &vd->bgpic->yof, -20.0,20.0, 10, 2, "Set the vertical offset of the background image");
uiDefButF(block, NUM, REDRAWVIEW3D, "X Offset:", 0, 6, 140, 19, &vd->bgpic->xof, -250.0,250.0, 10, 2, "Set the horizontal offset of the background image");
uiDefButF(block, NUM, REDRAWVIEW3D, "Y Offset:", 150, 6, 140, 19, &vd->bgpic->yof, -250.0,250.0, 10, 2, "Set the vertical offset of the background image");