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

Bug fix #1758

Browse Source 
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.
This commit is contained in:
Ton Roosendaal
2004-11-09 11:06:56 +00:00
parent 02314210ac
commit d95072d68e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

6
source/blender/src/editimasel.c
View File

@@ -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;
}