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

code cleanup:

Browse Source 
- remove duplicate includes
- blender builds with -Werror in C++ for fluids/smoke
This commit is contained in:
Campbell Barton
2012-05-21 06:33:45 +00:00
parent 000ac36290
commit be53fde9cd
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/elbeem/CMakeLists.txt
View File

@@ -86,9 +86,12 @@ set(SRC
intern/solver_interface.h intern/solver_interface.h
intern/solver_relax.h intern/solver_relax.h
intern/utilities.h intern/utilities.h
intern/globals.h intern/globals.h
) )
# elbeem has some harmless UNUSED warnings
remove_strict_flags()
add_definitions( add_definitions(
-DNOGUI -DNOGUI
-DELBEEM_BLENDER=1 -DELBEEM_BLENDER=1

8
source/blender/blenkernel/intern/mesh.c
View File

@@ -50,6 +50,7 @@
#include "BLI_math.h" #include "BLI_math.h"
#include "BLI_edgehash.h" #include "BLI_edgehash.h"
#include "BLI_scanfill.h" #include "BLI_scanfill.h"
#include "BLI_array.h"
#include "BKE_animsys.h" #include "BKE_animsys.h"
#include "BKE_main.h" #include "BKE_main.h"
@@ -70,11 +71,6 @@
#include "BKE_tessmesh.h" #include "BKE_tessmesh.h"
#include "BLI_edgehash.h" #include "BLI_edgehash.h"
#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "BLI_array.h"
#include "BLI_edgehash.h"
#include "bmesh.h" #include "bmesh.h"
enum { enum {
@@ -88,7 +84,7 @@ enum {
MESHCMP_POLYMISMATCH, MESHCMP_POLYMISMATCH,
MESHCMP_EDGEUNKNOWN, MESHCMP_EDGEUNKNOWN,
MESHCMP_VERTCOMISMATCH, MESHCMP_VERTCOMISMATCH,
MESHCMP_CDLAYERS_MISMATCH, MESHCMP_CDLAYERS_MISMATCH
}; };
static const char *cmpcode_to_str(int code) static const char *cmpcode_to_str(int code)

4
source/blender/blenkernel/intern/smoke.c
View File

@@ -103,7 +103,7 @@ static void tend ( void )
{ {
QueryPerformanceCounter ( &liCurrentTime ); QueryPerformanceCounter ( &liCurrentTime );
} }
static double tval( void ) static double UNUSED_FUNCTION(tval)( void )
{ {
return ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart)* (double)1000.0/(double)liFrequency.QuadPart )); return ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart)* (double)1000.0/(double)liFrequency.QuadPart ));
} }
@@ -120,7 +120,7 @@ static void tend ( void )
gettimeofday ( &_tend,&tz ); gettimeofday ( &_tend,&tz );
} }
static double tval( void ) static double UNUSED_FUNCTION(tval)( void )
{ {
double t1, t2; double t1, t2;
t1 = ( double ) _tstart.tv_sec*1000 + ( double ) _tstart.tv_usec/ ( 1000 ); t1 = ( double ) _tstart.tv_sec*1000 + ( double ) _tstart.tv_usec/ ( 1000 );