[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32641] trunk/blender/source/blender: fix warnings

[Campbell Barton]

Revision: 32641
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32641
Author:   campbellbarton
Date:     2010-10-22 00:45:54 +0200 (Fri, 22 Oct 2010)

Log Message:
-----------
fix warnings

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/collision.c
    trunk/blender/source/blender/blenkernel/intern/ipo.c
    trunk/blender/source/blender/blenlib/BLI_kdopbvh.h
    trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
    trunk/blender/source/blender/editors/curve/editcurve.c

Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c	2010-10-21 22:30:34 UTC (rev 32640)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c	2010-10-21 22:45:54 UTC (rev 32641)
@@ -1307,7 +1307,7 @@
 }
 #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 @@
 			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;

Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ipo.c	2010-10-21 22:30:34 UTC (rev 32640)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c	2010-10-21 22:45:54 UTC (rev 32641)
@@ -1123,7 +1123,8 @@
 {
 	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");

Modified: trunk/blender/source/blender/blenlib/BLI_kdopbvh.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_kdopbvh.h	2010-10-21 22:30:34 UTC (rev 32640)
+++ trunk/blender/source/blender/blenlib/BLI_kdopbvh.h	2010-10-21 22:45:54 UTC (rev 32641)
@@ -90,7 +90,7 @@
 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);
 

Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c	2010-10-21 22:30:34 UTC (rev 32640)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c	2010-10-21 22:45:54 UTC (rev 32641)
@@ -1126,9 +1126,9 @@
 	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;
 	

Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c	2010-10-21 22:30:34 UTC (rev 32640)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2010-10-21 22:45:54 UTC (rev 32641)
@@ -6012,7 +6012,6 @@
 	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;