Revision: 32629
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32629
Author: jesterking
Date: 2010-10-21 10:32:53 +0200 (Thu, 21 Oct 2010)
Log Message:
-----------
/WX enabled for MSVC in CMake too.
Warning fixes.
Modified Paths:
--------------
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/source/blender/blenkernel/BKE_collision.h
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenkernel/intern/fmodifier.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt 2010-10-21 07:48:51 UTC (rev
32628)
+++ trunk/blender/intern/ghost/CMakeLists.txt 2010-10-21 08:32:53 UTC (rev
32629)
@@ -69,6 +69,7 @@
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
ELSEIF(WIN32)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
LIST(APPEND INC ${WINTAB_INC})
LIST(APPEND SRC
Modified: trunk/blender/source/blender/blenkernel/BKE_collision.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_collision.h 2010-10-21
07:48:51 UTC (rev 32628)
+++ trunk/blender/source/blender/blenkernel/BKE_collision.h 2010-10-21
08:32:53 UTC (rev 32629)
@@ -136,7 +136,7 @@
/////////////////////////////////////////////////
// used in effect.c
/////////////////////////////////////////////////
-struct Object **get_collisionobjects(struct Scene *scene, struct Object *self,
struct Group *group, int *numcollobj);
+struct Object **get_collisionobjects(struct Scene *scene, struct Object *self,
struct Group *group, unsigned int *numcollobj);
typedef struct ColliderCache {
struct ColliderCache *next, *prev;
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2010-10-21
07:48:51 UTC (rev 32628)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2010-10-21
08:32:53 UTC (rev 32629)
@@ -130,6 +130,7 @@
ENDIF(WITH_LZMA)
IF(WIN32)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2010-10-21
07:48:51 UTC (rev 32628)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2010-10-21
08:32:53 UTC (rev 32629)
@@ -385,7 +385,8 @@
Cloth *cloth;
ListBase *effectors = NULL;
MVert *mvert;
- int i, ret = 0;
+ unsigned int i = 0;
+ int ret = 0;
/* simulate 1 frame forward */
cloth = clmd->clothObject;
@@ -1044,10 +1045,10 @@
Cloth *cloth = clmd->clothObject;
ClothSpring *spring = NULL, *tspring = NULL, *tspring2 = NULL;
unsigned int struct_springs = 0, shear_springs=0, bend_springs = 0;
- int i = 0;
- int numverts = dm->getNumVerts ( dm );
- int numedges = dm->getNumEdges ( dm );
- int numfaces = dm->getNumFaces ( dm );
+ unsigned int i = 0;
+ unsigned int numverts = (unsigned int)dm->getNumVerts ( dm );
+ unsigned int numedges = (unsigned int)dm->getNumEdges ( dm );
+ unsigned int numfaces = (unsigned int)dm->getNumFaces ( dm );
MEdge *medge = CDDM_get_edges ( dm );
MFace *mface = CDDM_get_faces ( dm );
int index2 = 0; // our second vertex index
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2010-10-21
07:48:51 UTC (rev 32628)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2010-10-21
08:32:53 UTC (rev 32629)
@@ -83,7 +83,7 @@
{
BVHTree *tree;
float co[12];
- int i;
+ unsigned int i;
MFace *tface = mfaces;
tree = BLI_bvhtree_new ( numfaces*2, epsilon, 4, 26 );
@@ -1342,12 +1342,12 @@
// return all collision objects in scene
// collision object will exclude self
-Object **get_collisionobjects(Scene *scene, Object *self, Group *group, int
*numcollobj)
+Object **get_collisionobjects(Scene *scene, Object *self, Group *group,
unsigned int *numcollobj)
{
Base *base;
Object **objs;
GroupObject *go;
- int numobj= 0, maxobj= 100;
+ unsigned int numobj= 0, maxobj= 100;
objs= MEM_callocN(sizeof(Object *)*maxobj, "CollisionObjectsArray");
@@ -1503,12 +1503,12 @@
{
Cloth *cloth= clmd->clothObject;
BVHTree *cloth_bvh= cloth->bvhtree;
- int i=0, numfaces = 0, numverts = 0, k, l, j;
+ unsigned int i=0, numfaces = 0, numverts = 0, k, l, j;
int rounds = 0; // result counts applied collisions; ic is for debug
output;
ClothVertex *verts = NULL;
int ret = 0, ret2 = 0;
Object **collobjs = NULL;
- int numcollobj = 0;
+ unsigned int numcollobj = 0;
if ((clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_COLLOBJ) ||
cloth_bvh==NULL)
return 0;
@@ -1605,11 +1605,11 @@
////////////////////////////////////////////////////////////
if ( clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_SELF )
{
- for(l = 0; l < clmd->coll_parms->self_loop_count; l++)
+ for(l = 0; l < (unsigned
int)clmd->coll_parms->self_loop_count; l++)
{
// TODO: add coll quality rounds again
BVHTreeOverlap *overlap = NULL;
- int result = 0;
+ unsigned int result = 0;
// collisions = 1;
verts = cloth->verts; // needed for openMP
Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/colortools.c 2010-10-21
07:48:51 UTC (rev 32628)
+++ trunk/blender/source/blender/blenkernel/intern/colortools.c 2010-10-21
08:32:53 UTC (rev 32629)
@@ -1004,7 +1004,8 @@
void scopes_update(Scopes *scopes, ImBuf *ibuf, int use_color_management)
{
- int x, y, c, n, nl;
+ int x, y, c;
+ unsigned int n, nl;
double div, divl;
float *rf=NULL;
unsigned char *rc=NULL;
Modified: trunk/blender/source/blender/blenkernel/intern/fmodifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fmodifier.c 2010-10-21
07:48:51 UTC (rev 32628)
+++ trunk/blender/source/blender/blenkernel/intern/fmodifier.c 2010-10-21
08:32:53 UTC (rev 32629)
@@ -146,7 +146,7 @@
nc=
MEM_callocN(sizeof(float)*(data->poly_order+1), "FMod_Generator_Coefs");
if (data->coefficients) {
- if (data->arraysize >
(data->poly_order+1))
+ if ((int)data->arraysize >
(data->poly_order+1))
memcpy(nc, data->coefficients,
sizeof(float)*(data->poly_order+1));
else
memcpy(nc, data->coefficients,
sizeof(float)*data->arraysize);
@@ -172,7 +172,7 @@
nc=
MEM_callocN(sizeof(float)*(data->poly_order*2), "FMod_Generator_Coefs");
if (data->coefficients) {
- if (data->arraysize > (data->poly_order
* 2))
+ if (data->arraysize > (unsigned
int)(data->poly_order * 2))
memcpy(nc, data->coefficients,
sizeof(float)*(data->poly_order * 2));
else
memcpy(nc, data->coefficients,
sizeof(float)*data->arraysize);
@@ -240,7 +240,7 @@
unsigned int i;
/* for each coefficient pair, solve for that bracket
before accumulating in value by multiplying */
- for (cp=data->coefficients, i=0; (cp) && (i <
data->poly_order); cp+=2, i++)
+ for (cp=data->coefficients, i=0; (cp) && (i < (unsigned
int)data->poly_order); cp+=2, i++)
value *= (cp[0]*evaltime + cp[1]);
/* only if something changed, write *cvalue in one go */
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2010-10-21
07:48:51 UTC (rev 32628)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2010-10-21
08:32:53 UTC (rev 32629)
@@ -1425,7 +1425,7 @@
by Lena Petrovic, Mark Henne and John Anderson
* Pixar Technical Memo #06-08, Pixar Animation Studios
*/
-static void hair_velocity_smoothing(ClothModifierData *clmd, lfVector *lF,
lfVector *lX, lfVector *lV, int numverts)
+static void hair_velocity_smoothing(ClothModifierData *clmd, lfVector *lF,
lfVector *lX, lfVector *lV, unsigned int numverts)
{
/* TODO: This is an initial implementation and should be made much
better in due time.
* What should at least be implemented is a grid size parameter and a
smoothing kernel
@@ -1441,10 +1441,10 @@
/* 2.0f is an experimental value that seems to give good results */
float smoothfac = 2.0f * clmd->sim_parms->velocity_smooth;
float collfac = 2.0f * clmd->sim_parms->collider_friction;
- int v = 0;
- int i = 0;
- int j = 0;
- int k = 0;
+ unsigned int v = 0;
+ unsigned int i = 0;
+ int j = 0;
+ int k = 0;
INIT_MINMAX(gmin, gmax);
@@ -1559,7 +1559,7 @@
{
/* Collect forces and derivatives: F,dFdX,dFdV */
Cloth *cloth = clmd->clothObject;
- int i = 0;
+ unsigned int i = 0;
float spring_air = clmd->sim_parms->Cvi * 0.01f; /*
viscosity of air scaled in percent */
float gravity[3] = {0.0f, 0.0f, 0.0f};
float tm2[3][3] = {{-spring_air,0,0},
{0,-spring_air,0},{0,0,-spring_air}};
Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ipo.c 2010-10-21
07:48:51 UTC (rev 32628)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c 2010-10-21
08:32:53 UTC (rev 32629)
@@ -1123,7 +1123,7 @@
{
AdrBit2Path *abp;
FCurve *fcu;
- int i=0, totbits;
+ unsigned int i=0, totbits;
/* allocate memory for a new F-Curve */
fcu= MEM_callocN(sizeof(FCurve), "FCurve");
@@ -1174,7 +1174,7 @@
abp= adrcode_bitmaps_to_paths(icu->blocktype, icu->adrcode, &totbits);
if (abp && totbits) {
FCurve *fcurve;
- int b;
+ unsigned int b;
if (G.f & G_DEBUG) printf("\tconvert bitflag ipocurve, totbits
= %d \n", totbits);
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2010-10-21
07:48:51 UTC (rev 32628)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2010-10-21
08:32:53 UTC (rev 32629)
@@ -1158,18 +1158,19 @@
MultiresLevel *lvl, *lvl1;
Multires *mr= me->mr;
MVert *vsrc, *vdst;
- int src, dst;
+ unsigned int src, dst;
int st = multires_side_tot[totlvl - 1] - 1;
int extedgelen = multires_side_tot[totlvl] - 2;
int *vvmap; // inorder for dst, map to src
int crossedgelen;
- int i, j, s, x, totvert, tottri, totquad;
+ int s, x, tottri, totquad;
+ unsigned int i, j, totvert;
src = 0;
dst = 0;
vsrc = mr->verts;
vdst = dm->getVertArray(dm);
- totvert = dm->getNumVerts(dm);
+ totvert = (unsigned int)dm->getNumVerts(dm);
vvmap = MEM_callocN(sizeof(int) * totvert, "multires vvmap");
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
