fix for warnings & detecting opensource nouveau drivers.

diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp
index fee011a70aec6caf290159177975753170a3495d..3d61697bbc699ed852c04b8050faea57597d83c7 100644 (file)
--- a/intern/elbeem/intern/solver_init.cpp
+++ b/intern/elbeem/intern/solver_init.cpp
@@ -1001,7 +1001,7 @@ bool LbmFsgrSolver::initializeSolverMemory()
        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 {

diff --git a/intern/elbeem/intern/utilities.h b/intern/elbeem/intern/utilities.h
index a5f63e696a6db6de4b7d757e8391d1e1fbd8223c..b0a58b13367b78bf3b7dfb19e0d5f63435183bee 100644 (file)
--- a/intern/elbeem/intern/utilities.h
+++ b/intern/elbeem/intern/utilities.h
@@ -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

diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 49f9fbebf5641ccf66cfdaa0cc02c9eeba36a1a5..70a74aafead7247731135288062f1598a2062f1a 100644 (file)
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -135,7 +135,7 @@ void GPU_extensions_init()
                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;
        }