Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for warnings & detecting opensource nouveau drivers.

Browse Source
This commit is contained in:
Campbell Barton
2010-10-22 01:06:21 +00:00
parent e51bb1fb0e
commit 97784a7186
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/elbeem/intern/solver_init.cpp
View File

@@ -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 {

3
intern/elbeem/intern/utilities.h
View File

@@ -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

2
source/blender/gpu/intern/gpu_extensions.c
View File

@@ -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;
}