/WX enabled for MSVC in CMake too.

Warning fixes.

diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 559d160cba205b181c957a233a4ed104617ce0c0..cd3bbd00b9fa4c120b0f79a4a0b151b1ef07ca3b 100644 (file)
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -69,6 +69,7 @@ IF(APPLE)
                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

diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h
index d7ae7df93429d85f6578425a813fe6b32d894a44..03d4800076cbf2c86fff76f3a2b87cac05988cac 100644 (file)
--- a/source/blender/blenkernel/BKE_collision.h
+++ b/source/blender/blenkernel/BKE_collision.h
@@ -136,7 +136,7 @@ void interpolateOnTriangle ( float to[3], float v1[3], float v2[3], float v3[3],
 /////////////////////////////////////////////////
 // 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;

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 1b6411e4f64acbcd436cd524357c3cb18c24ccb6..f6c8febd955b1ec7ad925b86d719fc2f1587ef3a 100644 (file)
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -130,6 +130,7 @@ IF(WITH_LZMA)
 ENDIF(WITH_LZMA)
 
 IF(WIN32)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
        LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 

diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index f1b167b38c7c927b2cda6a155f81394abcad477c..f8772cd802fffc5341285cb2bf521a25467a866f 100644 (file)
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -385,7 +385,8 @@ static int do_step_cloth(Object *ob, ClothModifierData *clmd, DerivedMesh *resul
        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 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm )
        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

diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index 5c9cc441b950afa4769a7d9b329931ff3c3262e3..62b587029e1f54aef4fa27a050a559592c2c8b3f 100644 (file)
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -83,7 +83,7 @@ BVHTree *bvhtree_build_from_mvert ( MFace *mfaces, unsigned int numfaces, MVert
 {
        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 @@ static void add_collision_object(Object ***objs, int *numobj, int *maxobj, Objec
 
 // 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 @@ int cloth_bvh_objcollision (Object *ob, ClothModifierData * clmd, float step, fl
 {
        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 @@ int cloth_bvh_objcollision (Object *ob, ClothModifierData * clmd, float step, fl
                ////////////////////////////////////////////////////////////
                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

diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 2d4e0ac8c0832a1b1dcabdf285e6230854014fbe..86d7cbf0133dc73f5288fc5f5eb860766442f4ab 100644 (file)
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -1004,7 +1004,8 @@ DO_INLINE void save_sample_line(Scopes *scopes, const int idx, const float fx, f
 
 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;

diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c
index 6660442b14adda3f55aa43539ba4f9a6e56f1230..c900f178ca702722c9c94feb99efd6b4478eba1f 100644 (file)
--- a/source/blender/blenkernel/intern/fmodifier.c
+++ b/source/blender/blenkernel/intern/fmodifier.c
@@ -146,7 +146,7 @@ static void fcm_generator_verify (FModifier *fcm)
                                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 @@ static void fcm_generator_verify (FModifier *fcm)
                                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 @@ static void fcm_generator_evaluate (FCurve *UNUSED(fcu), FModifier *fcm, float *
                        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 */

diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c
index e0077ec7d26fef34868d9870f482b06901f0f1e1..6ca957528871fbe196663234841e74e45e1ea4f6 100644 (file)
--- a/source/blender/blenkernel/intern/implicit.c
+++ b/source/blender/blenkernel/intern/implicit.c
@@ -1425,7 +1425,7 @@ typedef struct HairGridVert {
                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 @@ static void hair_velocity_smoothing(ClothModifierData *clmd, lfVector *lF, lfVec
        /* 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 @@ static void cloth_calc_force(ClothModifierData *clmd, float UNUSED(frame), lfVec
 {
        /* 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}};

diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 846592f0f2fd1dd44689a3866d3b53a2be6c229e..b6a6607e0628127eefd1694cdbe2611aa574ec32 100644 (file)
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -1123,7 +1123,7 @@ static void icu_to_fcurves (ID *id, ListBase *groups, ListBase *list, IpoCurve *
 {
        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 @@ static void icu_to_fcurves (ID *id, ListBase *groups, ListBase *list, IpoCurve *
        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);
                

diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index b0ab947d478c7948ed1929e887dc82b39e92a1e6..91f15d1ee6c8160134ab8471840a7b254545d41a 100644 (file)
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -1158,18 +1158,19 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
        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");
 
        lvl1 = mr->levels.first;
@@ -1260,7 +1261,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
                fmem = MEM_callocN(sizeof(IndexNode*) * (mr->level_count-1), "multires fmem");
                emem = MEM_callocN(sizeof(IndexNode*) * (mr->level_count-1), "multires emem");
                lvl = lvl1;
-               for(i = 0; i < mr->level_count - 1; ++i) {
+               for(i = 0; i < (unsigned int)mr->level_count - 1; ++i) {
                        create_old_vert_face_map(fmap + i, fmem + i, lvl->faces, lvl->totvert, lvl->totface);
                        create_old_vert_edge_map(emap + i, emem + i, lvl->edges, lvl->totvert, lvl->totedge);
                        lvl = lvl->next;
@@ -1297,7 +1298,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
 
                lvl = lvl->next;
 
-               for(i = 0; i < mr->level_count - 1; ++i) {
+               for(i = 0; i < (unsigned int)(mr->level_count - 1); ++i) {
                        MEM_freeN(fmap[i]);
                        MEM_freeN(fmem[i]);
                        MEM_freeN(emap[i]);

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 21b7cfd010c42389dd01033a2fb1385af06c31e3..5950a4630b7655c39be7bb188b042c6a00cc44c4 100644 (file)
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -62,8 +62,6 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-
-
 #include "BKE_context.h"
 #include "BKE_sound.h"
 #include "AUD_C-API.h"
@@ -3219,7 +3217,7 @@ void seq_offset_animdata(Scene *scene, Sequence *seq, int ofs)
 
        for (fcu= scene->adt->action->curves.first; fcu; fcu= fcu->next) {
                if(strstr(fcu->rna_path, "sequence_editor.sequences_all[") && strstr(fcu->rna_path, str)) {
-                       int i;
+                       unsigned int i;
                        for (i = 0; i < fcu->totvert; i++) {
                                BezTriple *bezt= &fcu->bezt[i];
                                bezt->vec[0][0] += ofs;

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index bb1a1a88a094d0d8a88b7228f37a3dd186880c32..cb3c0c08cc0b8b6b189271118c02fa56054fdcf6 100644 (file)
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -991,8 +991,8 @@ void txt_move_to (Text *text, unsigned int line, unsigned int ch, short sel)
                if ((*linep)->next) *linep= (*linep)->next;
                else break;
        }
-       if (ch>(*linep)->len)
-               ch= (*linep)->len;
+       if (ch>(unsigned int)((*linep)->len))
+               ch= (unsigned int)((*linep)->len);
        *charp= ch;
        
        if(!sel) txt_pop_sel(text);

diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 30a804be637417cecc7b003f1cc26de71d29d1ee..0ec38a035aa9ca648b0758fe9b566fa71091bc19 100644 (file)
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -955,7 +955,7 @@ int append_ffmpeg(RenderData *rd, int frame, int *pixels, int rectx, int recty,
 
 void end_ffmpeg(void)
 {
-       int i;
+       unsigned int i;
        
        fprintf(stderr, "Closing ffmpeg...\n");