diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2004-05-25 23:06:48 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2004-05-25 23:06:48 +0400 |
| commit | f99099109fbe109b18c58ed6ae2d076a99f6ddc8 (patch) | |
| tree | 81bfd1c582addbe7816fa844338f475a299f0e03 /source/blender | |
| parent | 8a64e0e8679ec645d0ddb78cac2ad9faae57b1c5 (diff) | |
Fixed a potential bug in the uv editor transform function, a check if the tface
might be only an edge was missing in one of the loops.
Fix a crash that would sometimes happen when clicking the texture painting
button in the image window header. Made headerbuttons_packdummy a static
variable again. The uiDefBut call for the texture painting button stores a
reference to it, so it must be kept in memory.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/src/editsima.c | 2 | ||||
| -rw-r--r-- | source/blender/src/header_image.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c index 7eaeaf3ca1d..3bc6dff4b90 100644 --- a/source/blender/src/editsima.c +++ b/source/blender/src/editsima.c @@ -378,7 +378,7 @@ void transform_tface_uv(int mode) tface= me->tface; mface= me->mface; for(a=me->totface; a>0; a--, tface++, mface++) { - if(tface->flag & TF_SELECT) { + if(mface->v3 && tface->flag & TF_SELECT) { if(tface->flag & TF_SEL1) tot++; if(tface->flag & TF_SEL2) tot++; if(tface->flag & TF_SEL3) tot++; diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index 93dd39ef79c..3a29dbbf1b4 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -352,9 +352,6 @@ void do_image_buttons(unsigned short event) } } -/* This should not be a stack var! */ -// static int headerbuttons_packdummy; - static void do_image_viewmenu(void *arg, int event) { @@ -918,7 +915,10 @@ void image_buttons(void) uiBlock *block; short xco, xmax; char naam[256]; - int headerbuttons_packdummy = 0; + /* This should not be a static var */ + static int headerbuttons_packdummy; + + headerbuttons_packdummy = 0; sprintf(naam, "header %d", curarea->headwin); block= uiNewBlock(&curarea->uiblocks, naam, UI_EMBOSS, UI_HELV, curarea->headwin); |