[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18044] branches/blender2.5/blender/source /blender/editors/space_node: 2.5

[Ton Roosendaal]

Revision: 18044
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18044
Author:   ton
Date:     2008-12-24 12:17:45 +0100 (Wed, 24 Dec 2008)

Log Message:
-----------
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.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_node/Makefile
    branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c

Modified: branches/blender2.5/blender/source/blender/editors/space_node/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/Makefile	2008-12-24 11:08:15 UTC (rev 18043)
+++ branches/blender2.5/blender/source/blender/editors/space_node/Makefile	2008-12-24 11:17:45 UTC (rev 18044)
@@ -37,6 +37,7 @@
 
 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../../blenlib
 CPPFLAGS += -I../../makesdna
 CPPFLAGS += -I../../imbuf
+CPPFLAGS += -I../../nodes
+CPPFLAGS += -I../../render/extern/include
 CPPFLAGS += -I../../python
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 

Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c	2008-12-24 11:08:15 UTC (rev 18043)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c	2008-12-24 11:17:45 UTC (rev 18044)
@@ -593,12 +593,12 @@
 	}
 	
 #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);