diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-11-09 14:06:56 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-11-09 14:06:56 +0300 |
| commit | d95072d68ee2c6246e1b60eb687d1d118cf27e4e (patch) | |
| tree | 4f5b4d4a3a0e9d741d9906a6b8ef76242103c376 | |
| parent | 02314210ac8c81e6f865e66ef5e7cf36ebd5d957 (diff) | |
Bug fix #1758
Using ImageSelect window for background pic in 3d window, assigned it to
wrong window... this because the image-select window wasn't pushed before
it used the callback to set the image.
| -rw-r--r-- | source/blender/src/drawview.c | 1 | ||||
| -rw-r--r-- | source/blender/src/editimasel.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index bc3d114a2ba..24cf6b04af5 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -1039,6 +1039,7 @@ static void load_bgpic_image(char *name) Image *ima; View3D *vd; + areawinset(curarea->win); vd= G.vd; if(vd==0 || vd->bgpic==0) return; diff --git a/source/blender/src/editimasel.c b/source/blender/src/editimasel.c index 8dcff8e4956..3fc97bb5d23 100644 --- a/source/blender/src/editimasel.c +++ b/source/blender/src/editimasel.c @@ -199,8 +199,8 @@ void winqreadimaselspace(ScrArea *sa, void *spacedata, BWinEvent *evt) char name[256]; strcpy(name, simasel->dir); strcat(name, simasel->file); - simasel->returnfunc(name); filesel_prevspace(); + simasel->returnfunc(name); } break; case 6: @@ -242,8 +242,8 @@ void winqreadimaselspace(ScrArea *sa, void *spacedata, BWinEvent *evt) if(simasel->mode & IMS_STRINGCODE) BLI_makestringcode(G.sce, name); - simasel->returnfunc(name); filesel_prevspace(); + simasel->returnfunc(name); } queredraw = 1; } @@ -411,8 +411,8 @@ void winqreadimaselspace(ScrArea *sa, void *spacedata, BWinEvent *evt) if (simasel->returnfunc){ strcpy(name, simasel->dir); strcat(name, simasel->file); - simasel->returnfunc(name); filesel_prevspace(); + simasel->returnfunc(name); } break; } |