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

- bug fixes:

Browse Source 
- "Crop and Anim" panel had wrong name... now "Anim and Movie"
  - this panel didnt draw buttons always, should be for 'anim option' (which
    is different from 'movie' option!
  - added call to re-align the panels each time a new screen is set (also
    after file read) to make sure new panels (or with new name) are properly
    initialized
  - fixed drawing error in nurbs buttons
This commit is contained in:
Ton Roosendaal
2003-11-17 12:11:42 +00:00
parent 61f203c80b
commit 0af974d757
3 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -921,7 +921,7 @@ static void editing_panel_curve_type(Object *ob, Curve *cu)
uiDefButS(block, TOG|BIT|5, 0, "UV Orco", 600,160,150,19, &cu->flag, 0, 0, 0, 0, "");
if(ob->type==OB_SURF)
uiDefButS(block, TOG|BIT|6, REDRAWVIEW3D, "No Puno Flip", 600,150,140,19, &cu->flag, 0, 0, 0, 0, "");
uiDefButS(block, TOG|BIT|6, REDRAWVIEW3D, "No Puno Flip", 600,140,150,19, &cu->flag, 0, 0, 0, 0, "");
uiDefBut(block, BUT,B_DOCENTRE, "Centre", 600, 115, 150, 19, 0, 0, 0, 0, 0, "Shifts object data to be centered about object's origin");
uiDefBut(block, BUT,B_DOCENTRENEW, "Centre New", 600, 95, 150, 19, 0, 0, 0, 0, 0, "Shifts object's origin to center of object data");

5
source/blender/src/buttons_shading.c
View File

@@ -856,11 +856,9 @@ static void texture_panel_image1(Tex *tex)
char str[32];
block= uiNewBlock(&curarea->uiblocks, "texture_panel1", UI_EMBOSS, UI_HELV, curarea->win);
if(uiNewPanel(curarea, block, "Crop and Anim", "Texture", 960, 0, 318, 204)==0) return;
if(uiNewPanel(curarea, block, "Anim and Movie", "Texture", 960, 0, 318, 204)==0) return;
uiSetButLock(tex->id.lib!=0, "Can't edit library data");
if(tex->imaflag & TEX_ANIM5) {
/* print amount of frames anim */
if(tex->ima && tex->ima->anim) {
uiDefBut(block, BUT, B_TEXSETFRAMES, "<", 802, 110, 20, 18, 0, 0, 0, 0, 0, "Paste number of frames in Frames: button");
@@ -890,7 +888,6 @@ static void texture_panel_image1(Tex *tex)
uiBlockEndAlign(block);
uiDefButS(block, TOG|BIT|6, 0, "Cyclic", 743,60,48,19, &tex->imaflag, 0, 0, 0, 0, "Repeat animation image");
}
}
static void texture_panel_image(Tex *tex)

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

@@ -1884,6 +1884,10 @@ void setscreen(bScreen *sc)
init_v2d_oops(&soops->v2d);
}
}
else if(sl->spacetype==SPACE_BUTS) {
SpaceButs *sbuts= (SpaceButs *)sl;
sbuts->re_align= 1; // force an align call, maybe new panels were added, also for after file reading
}
}
sa->cursor= CURSOR_STD;