fix warnings
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Oct 2010 22:45:54 +0000 (22:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Oct 2010 22:45:54 +0000 (22:45 +0000)
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenlib/BLI_kdopbvh.h
source/blender/blenlib/intern/BLI_kdopbvh.c
source/blender/editors/curve/editcurve.c

index 62b587029e1f54aef4fa27a050a559592c2c8b3f..d39e550192b13b3eb40f072b848f334c89356a81 100644 (file)
@@ -1307,7 +1307,7 @@ static int cloth_collision_moving ( ClothModifierData *clmd, CollisionModifierDa
 }
 #endif
 
-static void add_collision_object(Object ***objs, int *numobj, int *maxobj, Object *ob, Object *self, int level)
+static void add_collision_object(Object ***objs, unsigned int *numobj, unsigned int *maxobj, Object *ob, Object *self, int level)
 {
        CollisionModifierData *cmd= NULL;
 
@@ -1545,7 +1545,7 @@ int cloth_bvh_objcollision (Object *ob, ClothModifierData * clmd, float step, fl
                        Object *collob= collobjs[i];
                        CollisionModifierData *collmd = (CollisionModifierData*)modifiers_findByType(collob, eModifierType_Collision);
                        BVHTreeOverlap *overlap = NULL;
-                       int result = 0;
+                       unsigned int result = 0;
                        
                        if(!collmd->bvhtree)
                                continue;
index b6a6607e0628127eefd1694cdbe2611aa574ec32..a8e0aa81156aaa9cd7be93a0c64e28eb2ba4e3c6 100644 (file)
@@ -1123,7 +1123,8 @@ static void icu_to_fcurves (ID *id, ListBase *groups, ListBase *list, IpoCurve *
 {
        AdrBit2Path *abp;
        FCurve *fcu;
-       unsigned int i=0, totbits;
+       unsigned int i=0;
+       int totbits;
        
        /* allocate memory for a new F-Curve */
        fcu= MEM_callocN(sizeof(FCurve), "FCurve");
index d9e3d7e42c6fe820e61b949c3f48d2dfdc754e3e..aa55ececc0627702e174a96f88534027a2fc746c 100644 (file)
@@ -90,7 +90,7 @@ int BLI_bvhtree_update_node(BVHTree *tree, int index, float *co, float *co_movin
 void BLI_bvhtree_update_tree(BVHTree *tree);
 
 /* collision/overlap: check two trees if they overlap, alloc's *overlap with length of the int return value */
-BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, int *result);
+BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, unsigned int *result);
 
 float BLI_bvhtree_getepsilon(BVHTree *tree);
 
index 4d64f4a50ff611830ea0e85bb41b11d1faf59fd9..0204f9b14309d3f887daddad79dd3e0e2d7393fe 100644 (file)
@@ -1126,9 +1126,9 @@ static void traverse(BVHOverlapData *data, BVHNode *node1, BVHNode *node2)
        return;
 }
 
-BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, int *result)
+BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, unsigned int *result)
 {
-       int j, total = 0;
+       unsigned int j, total = 0;
        BVHTreeOverlap *overlap = NULL, *to = NULL;
        BVHOverlapData **data;
        
index 9dfca2d61bfafd4147d8f5bdbad71eeb11ef9558..97379cc110cf02738e1bb1348bff3bcfc7daf882 100644 (file)
@@ -6012,7 +6012,6 @@ static int curvesurf_prim_add(bContext *C, wmOperator *op, int type, int isSurf)
        if (!isSurf) { /* adding curve */
                if(obedit==NULL || obedit->type!=OB_CURVE) {
                        Curve *cu;
-                       Scene *scene= CTX_data_scene(C);
                        obedit= ED_object_add_type(C, OB_CURVE, loc, rot, TRUE, layer);
                        newob = 1;