[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13607] trunk/blender/source/blender: Just removed some unused vars cleaning up some little warnings.

Kent Mein mein at cs.umn.edu
Fri Feb 8 16:36:42 CET 2008


Revision: 13607
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13607
Author:   sirdude
Date:     2008-02-08 16:36:39 +0100 (Fri, 08 Feb 2008)

Log Message:
-----------
Just removed some unused vars cleaning up some little warnings.

Kent

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/softbody.c
    trunk/blender/source/blender/imbuf/intern/scaling.c
    trunk/blender/source/blender/src/editobject.c

Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c	2008-02-08 15:16:27 UTC (rev 13606)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c	2008-02-08 15:36:39 UTC (rev 13607)
@@ -2498,7 +2498,7 @@
 		if(bp->goal < SOFTGOALSNAP){ /* ommit this bp when it snaps */
 			float auxvect[3];  
 			float velgoal[3];
-			float absvel =0, projvel= 0;
+
 			/* do goal stuff */
 			if(ob->softflag & OB_SB_GOAL) {
 				/* true elastic goal */
@@ -2577,7 +2577,6 @@
 				/* friction in media done */
 				if(nl_flags & NLF_BUILD){
 					int ia =3*(sb->totpoint-a);
-					int op =3*sb->totpoint;
 					/* da/dv =  */ 
 
 					nlMatrixAdd(ia,ia,forcetime*kd);
@@ -2615,8 +2614,8 @@
 					}
 					Vec3PlusStVec(bp->force,kd,defforce);
 					if (nl_flags & NLF_BUILD){
-						int ia =3*(sb->totpoint-a);
-						int op =3*sb->totpoint;
+						// int ia =3*(sb->totpoint-a);
+						// int op =3*sb->totpoint;
 						//dfdx_goal(ia,ia,op,mpos); // don't do unless you know
 						//dfdv_goal(ia,ia,-cf);
 
@@ -2736,10 +2735,10 @@
 	float maxerrpos= 0.0f,maxerrvel = 0.0f,maxerrvel2 = 0.0f;
 	int a,fuzzy=0;
 
-    forcetime *= sb_time_scale(ob);
+	forcetime *= sb_time_scale(ob);
     
-    aabbmin[0]=aabbmin[1]=aabbmin[2] = 1e20f;
-    aabbmax[0]=aabbmax[1]=aabbmax[2] = -1e20f;
+	aabbmin[0]=aabbmin[1]=aabbmin[2] = 1e20f;
+	aabbmax[0]=aabbmax[1]=aabbmax[2] = -1e20f;
 
 	/* claim a minimum mass for vertex */
 	if (sb->nodemass > 0.009999f) timeovermass = forcetime/sb->nodemass;

Modified: trunk/blender/source/blender/imbuf/intern/scaling.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/scaling.c	2008-02-08 15:16:27 UTC (rev 13606)
+++ trunk/blender/source/blender/imbuf/intern/scaling.c	2008-02-08 15:36:39 UTC (rev 13607)
@@ -923,7 +923,7 @@
 	if (ibuf->rect) {
 		unsigned char * newrect = 
 			MEM_mallocN(newx * newy * sizeof(int), "q_scale rect");
-		q_scale_byte(ibuf->rect, newrect, ibuf->x, ibuf->y,
+		q_scale_byte((unsigned char *)ibuf->rect, newrect, ibuf->x, ibuf->y,
 			     newx, newy);
 
 		imb_freerectImBuf(ibuf);

Modified: trunk/blender/source/blender/src/editobject.c
===================================================================
--- trunk/blender/source/blender/src/editobject.c	2008-02-08 15:16:27 UTC (rev 13606)
+++ trunk/blender/source/blender/src/editobject.c	2008-02-08 15:36:39 UTC (rev 13607)
@@ -4341,7 +4341,6 @@
 {
 	Object *ob;
 	Base *base;
-	Ipo *ma, *man;
 	ID *id;
 	
 	base= FIRSTBASE;





More information about the Bf-blender-cvs mailing list