kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: unused defines, remove unused scanfill success value from BLI_scanfill_begin().

Browse Source
This commit is contained in:
Campbell Barton 2013-04-10 23:52:07 +00:00
parent c68ae745b6
commit ece766ee7e
4 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/elbeem/intern/simulation_object.cpp
View File

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

2
intern/smoke/intern/spectrum.cpp
View File

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

25
source/blender/blenlib/BLI_scanfill.h
View File

@ -107,31 +107,14 @@ enum {
* when this flag is set, we'll never get back more faces then (totvert - 2) */
BLI_SCANFILL_CALC_HOLES = (1 << 2)
};
int BLI_scanfill_begin(ScanFillContext *sf_ctx);
int BLI_scanfill_calc(ScanFillContext *sf_ctx, const int flag);
int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag,
const float nor_proj[3]);
void BLI_scanfill_begin(ScanFillContext *sf_ctx);
int BLI_scanfill_calc(ScanFillContext *sf_ctx, const int flag);
int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag,
const float nor_proj[3]);
void BLI_scanfill_end(ScanFillContext *sf_ctx);
/* These callbacks are needed to make the lib finction properly */
/**
* Set a function taking a (char *) as argument to flag errors. If the
* callback is not set, the error is discarded.
* \param f The function to use as callback
* \attention used in creator.c
*/
void BLI_setErrorCallBack(void (*f)(const char *));
/**
* Set a function to be able to interrupt the execution of processing
* in this module. If the function returns true, the execution will
* terminate gracefully. If the callback is not set, interruption is
* not possible.
* \param f The function to use as callback
* \attention used in creator.c
*/
void BLI_setInterruptCallBack(int (*f)(void));
#ifdef __cplusplus

18
source/blender/blenlib/intern/scanfill.c
View File

@ -47,11 +47,25 @@
static void (*BLI_localErrorCallBack)(const char *) = NULL;
static int (*BLI_localInterruptCallBack)(void) = NULL;
/**
* Set a function taking a (char *) as argument to flag errors. If the
* callback is not set, the error is discarded.
* \param f The function to use as callback
* \attention used in creator.c
*/
void BLI_setErrorCallBack(void (*f)(const char *))
{
BLI_localErrorCallBack = f;
}
/**
* Set a function to be able to interrupt the execution of processing
* in this module. If the function returns true, the execution will
* terminate gracefully. If the callback is not set, interruption is
* not possible.
* \param f The function to use as callback
* \attention used in creator.c
*/
void BLI_setInterruptCallBack(int (*f)(void))
{
BLI_localInterruptCallBack = f;
@ -826,11 +840,9 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int flag)
}
int BLI_scanfill_begin(ScanFillContext *sf_ctx)
void BLI_scanfill_begin(ScanFillContext *sf_ctx)
{
memset(sf_ctx, 0, sizeof(*sf_ctx));
return 1;
}
int BLI_scanfill_calc(ScanFillContext *sf_ctx, const int flag)