diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-09-18 22:34:50 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-09-18 22:34:50 +0400 |
| commit | 34aa59c5c3739e7fd96e0e68558540c0dec285cf (patch) | |
| tree | 96f128c0e4152fbb9c566e5d347f607dc4a41dad | |
| parent | e7087aa26b1d0f6abca8732166a33b6e9b8c2c30 (diff) | |
- redo now also ctrl+y.
- made undo/redo display of previewrender nice
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 | ||||
| -rw-r--r-- | source/blender/src/previewrender.c | 1 | ||||
| -rw-r--r-- | source/blender/src/space.c | 3 | ||||
| -rw-r--r-- | source/blender/src/toets.c | 6 |
4 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f75af94ea4f..697f281a948 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2569,7 +2569,7 @@ static void lib_link_screen(FileData *fd, Main *main) if(v3d->bgpic) { v3d->bgpic->ima= newlibadr_us(fd, sc->id.lib, v3d->bgpic->ima); v3d->bgpic->tex= newlibadr_us(fd, sc->id.lib, v3d->bgpic->tex); - v3d->bgpic->rect= 0; + v3d->bgpic->rect= NULL; } if(v3d->localvd) { v3d->localvd->camera= newlibadr(fd, sc->id.lib, v3d->localvd->camera); @@ -2712,8 +2712,7 @@ void lib_link_screen_restore(Main *newmain, char mode, Scene *curscene) else if(sl->spacetype==SPACE_BUTS) { SpaceButs *sbuts= (SpaceButs *)sl; sbuts->lockpoin= NULL; - if(sbuts->rect) MEM_freeN(sbuts->rect); - sbuts->rect= NULL; + sbuts->cury= 0; // we leave rect, for nicer redraws } else if(sl->spacetype==SPACE_FILE) { SpaceFile *sfile= (SpaceFile *)sl; diff --git a/source/blender/src/previewrender.c b/source/blender/src/previewrender.c index ed73a520a50..4db3f795910 100644 --- a/source/blender/src/previewrender.c +++ b/source/blender/src/previewrender.c @@ -344,6 +344,7 @@ void BIF_all_preview_changed(void) /* signal all previews in current screen of current type */ void BIF_preview_changed(SpaceButs *sbuts) { + /* can be called when no buttonswindow visible */ if(sbuts) { ScrArea *sa; diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 2ade584c712..8d864567cf0 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1538,8 +1538,7 @@ void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) else if(G.f & G_VERTEXPAINT) vpaint_undo(); else { - if(U.uiflag & USER_GLOBALUNDO) BIF_undo(); - else single_user(); + single_user(); } } else if(G.qual==LR_SHIFTKEY) diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c index dde0fc834a1..02717e86e30 100644 --- a/source/blender/src/toets.c +++ b/source/blender/src/toets.c @@ -967,6 +967,12 @@ int blenderqread(unsigned short event, short val) } } break; + case YKEY: // redo alternative + if(G.qual==LR_CTRLKEY) { + BIF_redo(); + return 0; + } + break; case ZKEY: // undo if(G.qual & (LR_CTRLKEY|LR_COMMANDKEY)) { // all combos with ctrl/cammandkey are accepted if ELEM(G.qual, LR_CTRLKEY, LR_COMMANDKEY) BIF_undo(); |