forked from bartvdbraak/blender
code cleanup:
- remove duplicate includes - blender builds with -Werror in C++ for fluids/smoke
This commit is contained in:
parent
000ac36290
commit
be53fde9cd
@ -86,9 +86,12 @@ set(SRC
|
||||
intern/solver_interface.h
|
||||
intern/solver_relax.h
|
||||
intern/utilities.h
|
||||
intern/globals.h
|
||||
intern/globals.h
|
||||
)
|
||||
|
||||
# elbeem has some harmless UNUSED warnings
|
||||
remove_strict_flags()
|
||||
|
||||
add_definitions(
|
||||
-DNOGUI
|
||||
-DELBEEM_BLENDER=1
|
||||
|
@ -50,6 +50,7 @@
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_edgehash.h"
|
||||
#include "BLI_scanfill.h"
|
||||
#include "BLI_array.h"
|
||||
|
||||
#include "BKE_animsys.h"
|
||||
#include "BKE_main.h"
|
||||
@ -70,11 +71,6 @@
|
||||
#include "BKE_tessmesh.h"
|
||||
#include "BLI_edgehash.h"
|
||||
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_array.h"
|
||||
#include "BLI_edgehash.h"
|
||||
|
||||
#include "bmesh.h"
|
||||
|
||||
enum {
|
||||
@ -88,7 +84,7 @@ enum {
|
||||
MESHCMP_POLYMISMATCH,
|
||||
MESHCMP_EDGEUNKNOWN,
|
||||
MESHCMP_VERTCOMISMATCH,
|
||||
MESHCMP_CDLAYERS_MISMATCH,
|
||||
MESHCMP_CDLAYERS_MISMATCH
|
||||
};
|
||||
|
||||
static const char *cmpcode_to_str(int code)
|
||||
|
@ -103,7 +103,7 @@ static void tend ( void )
|
||||
{
|
||||
QueryPerformanceCounter ( &liCurrentTime );
|
||||
}
|
||||
static double tval( void )
|
||||
static double UNUSED_FUNCTION(tval)( void )
|
||||
{
|
||||
return ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart)* (double)1000.0/(double)liFrequency.QuadPart ));
|
||||
}
|
||||
@ -120,7 +120,7 @@ static void tend ( void )
|
||||
gettimeofday ( &_tend,&tz );
|
||||
}
|
||||
|
||||
static double tval( void )
|
||||
static double UNUSED_FUNCTION(tval)( void )
|
||||
{
|
||||
double t1, t2;
|
||||
t1 = ( double ) _tstart.tv_sec*1000 + ( double ) _tstart.tv_usec/ ( 1000 );
|
||||
|
Loading…
Reference in New Issue
Block a user