diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-11 03:52:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-11 03:52:07 +0400 |
| commit | ece766ee7e22358378eead26bb54f27601b02e2b (patch) | |
| tree | e126d012c598c71a80289e71957ee14cdad81bde /intern | |
| parent | c68ae745b677c02899fda37a1f573ab688a99fac (diff) | |
code cleanup: unused defines, remove unused scanfill success value from BLI_scanfill_begin().
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/elbeem/intern/simulation_object.cpp | 4 | ||||
| -rw-r--r-- | intern/smoke/intern/spectrum.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/intern/elbeem/intern/simulation_object.cpp b/intern/elbeem/intern/simulation_object.cpp index d89b28bbf7a..9e98adfc734 100644 --- a/intern/elbeem/intern/simulation_object.cpp +++ b/intern/elbeem/intern/simulation_object.cpp @@ -33,7 +33,7 @@ LbmSolverInterface* createSolver(); #if PARALLEL==1 -int omp_threadcache; +static int omp_threadcache; #endif /****************************************************************************** @@ -71,7 +71,7 @@ SimulationObject::~SimulationObject() if(mpParam) delete mpParam; if(mpParts) delete mpParts; debMsgStd("SimulationObject",DM_MSG,"El'Beem Done!\n",10); -#if PARALLEL==1 +#if (PARALLEL == 1) omp_set_num_threads(omp_threadcache); printf("Resetting omp_threads to cached value %d \n", omp_threadcache); #endif diff --git a/intern/smoke/intern/spectrum.cpp b/intern/smoke/intern/spectrum.cpp index 30433451ac2..e1c2b4d1e42 100644 --- a/intern/smoke/intern/spectrum.cpp +++ b/intern/smoke/intern/spectrum.cpp @@ -52,8 +52,10 @@ struct colourSystem { /* White point chromaticities. */ +#if 0 #define IlluminantC 0.3101, 0.3162 /* For NTSC television */ #define IlluminantD65 0.3127, 0.3291 /* For EBU and SMPTE */ +#endif #define IlluminantE 0.33333333, 0.33333333 /* CIE equal-energy illuminant */ /* Gamma of nonlinear correction. |