diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-22 05:06:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-22 05:06:21 +0400 |
| commit | 97784a7186f00e5eea1b241e528ea105ddcdef64 (patch) | |
| tree | 25bdcc6d2dd92952007d8530df60842cbf86e3ab | |
| parent | e51bb1fb0ee1ba5e297b25e3f2474c4762546183 (diff) | |
fix for warnings & detecting opensource nouveau drivers.
| -rw-r--r-- | intern/elbeem/intern/solver_init.cpp | 2 | ||||
| -rw-r--r-- | intern/elbeem/intern/utilities.h | 3 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index fee011a70ae..3d61697bbc6 100644 --- 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 a5f63e696a6..b0a58b13367 100644 --- 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 49f9fbebf56..70a74aafead 100644 --- 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; } |