diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-12-24 14:17:45 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-12-24 14:17:45 +0300 |
| commit | 9bb7babd2c17f4be6aea2ffbfe89e18fffbd0341 (patch) | |
| tree | e49e489cc437c34b6ff300c4efffb02c9d4366fa | |
| parent | e60e7f36679109a6c600f0029a60486e99d7995b (diff) | |
2.5
Made nodes compile for Makefile and mac.
It has a hack for intel cards in node previews... not sure if that is
still valid? commented it out.
| -rw-r--r-- | source/blender/editors/space_node/Makefile | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_draw.c | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/editors/space_node/Makefile b/source/blender/editors/space_node/Makefile index d6280dd143c..70a203858a3 100644 --- a/source/blender/editors/space_node/Makefile +++ b/source/blender/editors/space_node/Makefile @@ -37,6 +37,7 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) +CPPFLAGS += -I$(NAN_BMFONT)/include # not very neat.... CPPFLAGS += -I../../windowmanager @@ -45,6 +46,8 @@ CPPFLAGS += -I../../blenkernel CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../imbuf +CPPFLAGS += -I../../nodes +CPPFLAGS += -I../../render/extern/include CPPFLAGS += -I../../python CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index ca522678c20..2f09f87ef9e 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -593,12 +593,12 @@ static void node_draw_preview(bNodePreview *preview, rctf *prv) } #ifdef __APPLE__ - if(is_a_really_crappy_nvidia_card()) { - float zoomx= curarea->winx/(float)(G.v2d->cur.xmax-G.v2d->cur.xmin); - float zoomy= curarea->winy/(float)(G.v2d->cur.ymax-G.v2d->cur.ymin); - glPixelZoom(zoomx*xscale, zoomy*yscale); - } - else +// if(is_a_really_crappy_nvidia_card()) { XXX +// float zoomx= curarea->winx/(float)(G.v2d->cur.xmax-G.v2d->cur.xmin); +// float zoomy= curarea->winy/(float)(G.v2d->cur.ymax-G.v2d->cur.ymin); +// glPixelZoom(zoomx*xscale, zoomy*yscale); +// } +// else #endif glPixelZoom(xscale, yscale); |