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

2.5 / Nodes

Browse Source 
* fix icon scaling -> SpaceNode aspect.
* bring back a bit more code
This commit is contained in:
Nathan Letwory
2008-12-26 18:00:38 +00:00
parent f10e828b1e
commit ce733db5cb
4 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/space_node/drawnode.c
View File

@@ -98,8 +98,8 @@
#include "UI_resources.h"
/*
#include "RE_pipeline.h"
#include "IMB_imbuf_types.h"*/
#include "RE_pipeline.h"*/
#include "IMB_imbuf_types.h"
/*#include "blendef.h"
#include "butspace.h"*/
@@ -2503,12 +2503,11 @@ static void draw_nodespace_grid(SpaceNode *snode)
glEnd();
}
#endif
static void draw_nodespace_back_pix(ScrArea *sa, SpaceNode *snode)
void draw_nodespace_back_pix(ScrArea *sa, SpaceNode *snode)
{
draw_nodespace_grid(snode);
if((snode->flag & SNODE_BACKDRAW) && snode->treetype==NTREE_COMPOSIT) {
Image *ima= BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
@@ -2516,9 +2515,9 @@ static void draw_nodespace_back_pix(ScrArea *sa, SpaceNode *snode)
int x, y;
/* somehow the offset has to be calculated inverse */
glaDefine2DArea(&sa->winrct);
//glaDefine2DArea(&sa->winrct);
/* ortho at pixel level curarea */
myortho2(-0.375, sa->winx-0.375, -0.375, sa->winy-0.375);
//myortho2(-0.375, sa->winx-0.375, -0.375, sa->winy-0.375);
x = (sa->winx-ibuf->x)/2 + snode->xof;
y = (sa->winy-ibuf->y)/2 + snode->yof;
@@ -2529,13 +2528,14 @@ static void draw_nodespace_back_pix(ScrArea *sa, SpaceNode *snode)
glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_RGBA, GL_FLOAT, ibuf->rect_float);
/* sort this out, this should not be needed */
myortho2(snode->v2d.cur.xmin, snode->v2d.cur.xmax, snode->v2d.cur.ymin, snode->v2d.cur.ymax);
bwin_clear_viewmat(sa->win); /* clear buttons view */
//myortho2(snode->v2d.cur.xmin, snode->v2d.cur.xmax, snode->v2d.cur.ymin, snode->v2d.cur.ymax);
//bwin_clear_viewmat(sa->win); /* clear buttons view */
glLoadIdentity();
}
}
}
#if 0
#if 0
/* note: needs to be userpref or opengl profile option */
static void draw_nodespace_back_tex(ScrArea *sa, SpaceNode *snode)