[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32643] trunk/blender: fix for warnings & detecting opensource nouveau drivers.

[Campbell Barton]

Revision: 32643
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32643
Author:   campbellbarton
Date:     2010-10-22 03:06:21 +0200 (Fri, 22 Oct 2010)

Log Message:
-----------
fix for warnings & detecting opensource nouveau drivers.

Modified Paths:
--------------
    trunk/blender/intern/elbeem/intern/solver_init.cpp
    trunk/blender/intern/elbeem/intern/utilities.h
    trunk/blender/source/blender/gpu/intern/gpu_extensions.c

Modified: trunk/blender/intern/elbeem/intern/solver_init.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_init.cpp	2010-10-22 00:29:56 UTC (rev 32642)
+++ trunk/blender/intern/elbeem/intern/solver_init.cpp	2010-10-22 01:06:21 UTC (rev 32643)
@@ -1001,7 +1001,7 @@
 	preinitGrids();
 	for(int lev=0; lev<=mMaxRefine; lev++) {
 		FSGR_FORIJK_BOUNDS(lev) {
-			RFLAG(lev,i,j,k,0) = RFLAG(lev,i,j,k,0) = 0; // reset for changeFlag usage
+			RFLAG(lev,i,j,k,0) = 0, RFLAG(lev,i,j,k,0) = 0; // reset for changeFlag usage
 			if(!mAllfluid) {
 				initEmptyCell(lev, i,j,k, CFEmpty, -1.0, -1.0); 
 			} else {

Modified: trunk/blender/intern/elbeem/intern/utilities.h
===================================================================
--- trunk/blender/intern/elbeem/intern/utilities.h	2010-10-22 00:29:56 UTC (rev 32642)
+++ trunk/blender/intern/elbeem/intern/utilities.h	2010-10-22 01:06:21 UTC (rev 32643)
@@ -12,6 +12,9 @@
 
 /* debugging outputs , debug level 0 (off) to 10 (max) */
 #ifdef ELBEEM_PLUGIN
+#ifdef DEBUG
+#undef DEBUG
+#endif
 #define DEBUG 0
 #else // ELBEEM_PLUGIN
 #define DEBUG 10

Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2010-10-22 00:29:56 UTC (rev 32642)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2010-10-22 01:06:21 UTC (rev 32643)
@@ -135,7 +135,7 @@
 		GG.device = GPU_DEVICE_ATI;
 		GG.driver = GPU_DRIVER_OPENSOURCE;
 	}
-	else if(strstr(renderer, "Nouveau")) {
+	else if(strstr(renderer, "Nouveau") || strstr(vendor, "nouveau")) {
 		GG.device = GPU_DEVICE_NVIDIA;
 		GG.driver = GPU_DRIVER_OPENSOURCE;
 	}