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

2.5: Image space, two fixes:

Browse Source 
* With one item in ID databrowse list, you couldn't activate it.
* Render result without render image now displays grid at size
  according to render settings again.
This commit is contained in:
Brecht Van Lommel
2009-02-17 20:37:23 +00:00
parent 573e14c592
commit ec8c8f08ba
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/interface/interface_utils.c
View File

@@ -440,7 +440,7 @@ static void idpoin_cb(bContext *C, void *arg_params, void *arg_event)
for(idtest=lb->first, nr=1; idtest; idtest=idtest->next, nr++) {
if(nr==params->browsenr) {
if(id == idtest)
if(*id_p == idtest)
return;
*id_p= idtest;
@@ -1128,7 +1128,5 @@ void curvemap_buttons(uiBlock *block, CurveMapping *cumap, char labeltype, short
uiDefBut(block, BUT_CURVE, event, "",
rect->xmin, rect->ymin, rect->xmax-rect->xmin, fy-rect->ymin,
cumap, 0.0f, 1.0f, 0, 0, "");
}

22
source/blender/editors/space_image/space_image.c
View File

@@ -276,32 +276,32 @@ static int image_context(const bContext *C, bContextDataMember member, bContextD
/************************** main region ***************************/
/* sets up the fields of the View2D from zoom and offset */
static void image_main_area_set_view2d(SpaceImage *sima, ARegion *ar)
static void image_main_area_set_view2d(SpaceImage *sima, ARegion *ar, Scene *scene)
{
Image *ima= ED_space_image(sima);
float x1, y1, w, h;
int width, height, winx, winy;
ED_space_image_size(sima, &width, &height);
#if 0
if(image_preview_active(curarea, &xim, &yim));
else if(sima->image) {
if(image_preview_active(curarea, &width, &height));
#endif
if(sima->image) {
ImBuf *ibuf= ED_space_image_buffer(sima);
float xuser_asp, yuser_asp;
ED_image_aspect(sima->image, &xuser_asp, &yuser_asp);
if(ibuf) {
xim= ibuf->x * xuser_asp;
yim= ibuf->y * yuser_asp;
width= ibuf->x * xuser_asp;
width= ibuf->y * yuser_asp;
}
else if( sima->image->type==IMA_TYPE_R_RESULT ) {
/* not very important, just nice */
xim= (G.scene->r.xsch*G.scene->r.size)/100;
yim= (G.scene->r.ysch*G.scene->r.size)/100;
width= (scene->r.xsch*scene->r.size)/100;
height= (scene->r.ysch*scene->r.size)/100;
}
}
#endif
ED_space_image_size(sima, &width, &height);
w= width;
h= height;
@@ -373,7 +373,7 @@ static void image_main_area_draw(const bContext *C, ARegion *ar)
glClear(GL_COLOR_BUFFER_BIT);
/* we set view2d from own zoom and offset each time */
image_main_area_set_view2d(sima, ar);
image_main_area_set_view2d(sima, ar, scene);
/* we draw image in pixelspace */
draw_image_main(sima, ar, scene);