[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34183] trunk/blender/source/blender: remove unused vars, comment some which look like they could be useful still.

Campbell Barton ideasman42 at gmail.com
Sun Jan 9 02:17:57 CET 2011


Revision: 34183
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34183
Author:   campbellbarton
Date:     2011-01-09 01:17:56 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
remove unused vars, comment some which look like they could be useful still.  have makesrna.c omit unused _data definitions for rna funcs with no args.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/blenkernel/intern/cloth.c
    trunk/blender/source/blender/blenkernel/intern/softbody.c
    trunk/blender/source/blender/editors/armature/meshlaplacian.c
    trunk/blender/source/blender/editors/interface/interface_handlers.c
    trunk/blender/source/blender/editors/interface/view2d.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c
    trunk/blender/source/blender/editors/space_file/file_ops.c
    trunk/blender/source/blender/editors/space_logic/logic_window.c
    trunk/blender/source/blender/editors/space_nla/nla_buttons.c
    trunk/blender/source/blender/editors/space_outliner/outliner.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
    trunk/blender/source/blender/editors/space_text/text_draw.c
    trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
    trunk/blender/source/blender/makesrna/intern/makesrna.c
    trunk/blender/source/blender/makesrna/intern/rna_access.c
    trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
    trunk/blender/source/blender/makesrna/intern/rna_mesh.c
    trunk/blender/source/blender/makesrna/intern/rna_ui_api.c

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-01-08 19:42:26 UTC (rev 34182)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-01-09 01:17:56 UTC (rev 34183)
@@ -1284,7 +1284,7 @@
 	EditFace *efa;
 	char *data, *emdata;
 	void *datalayer;
-	int index, offset, size;
+	int index, size;
 
 	datalayer = DM_get_face_data_layer(dm, type);
 	if(datalayer)
@@ -1296,7 +1296,7 @@
 		index = CustomData_get_layer_index(&em->fdata, type);
 
 		if(index != -1) {
-			offset = em->fdata.layers[index].offset;
+			/* int offset = em->fdata.layers[index].offset; */ /* UNUSED */
 			size = CustomData_sizeof(type);
 
 			DM_add_face_layer(dm, type, CD_CALLOC, NULL);

Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c	2011-01-08 19:42:26 UTC (rev 34182)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c	2011-01-09 01:17:56 UTC (rev 34183)
@@ -164,7 +164,6 @@
 	BVHTree *bvhtree;
 	Cloth *cloth;
 	ClothVertex *verts;
-	MFace *mfaces;
 	float co[12];
 
 	if(!clmd)
@@ -176,7 +175,6 @@
 		return NULL;
 	
 	verts = cloth->verts;
-	mfaces = cloth->mfaces;
 	
 	// in the moment, return zero if no faces there
 	if(!cloth->numverts)

Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c	2011-01-08 19:42:26 UTC (rev 34182)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c	2011-01-09 01:17:56 UTC (rev 34183)
@@ -2453,7 +2453,8 @@
 	SoftBody *sb= ob->soft;	/* is supposed to be there */
 	BodyPoint *bproot;
 	ListBase *do_effector = NULL;
-	float iks, gravity;
+	float gravity;
+	/* float iks; */
 	float fieldfactor = -1.0f, windfactor  = 0.25;
 	int   do_deflector,do_selfcollision,do_springcollision,do_aero;
 
@@ -2465,7 +2466,7 @@
 	do_springcollision=do_deflector && (ob->softflag & OB_SB_EDGES) &&(ob->softflag & OB_SB_EDGECOLL);
 	do_aero=((sb->aeroedge)&& (ob->softflag & OB_SB_EDGES));
 
-	iks  = 1.0f/(1.0f-sb->inspring)-1.0f ;/* inner spring constants function */
+	/* iks  = 1.0f/(1.0f-sb->inspring)-1.0f; */ /* inner spring constants function */ /* UNUSED */
 	bproot= sb->bpoint; /* need this for proper spring addressing */
 
 	if (do_springcollision || do_aero)

Modified: trunk/blender/source/blender/editors/armature/meshlaplacian.c
===================================================================
--- trunk/blender/source/blender/editors/armature/meshlaplacian.c	2011-01-08 19:42:26 UTC (rev 34182)
+++ trunk/blender/source/blender/editors/armature/meshlaplacian.c	2011-01-09 01:17:56 UTC (rev 34183)
@@ -649,8 +649,8 @@
 	MFace *mface;
 	float solution, weight;
 	int *vertsflipped = NULL, *mask= NULL;
-	int a, totface, j, bbone, firstsegment, lastsegment, thrownerror = 0;
-	
+	int a, totface, j, bbone, firstsegment, lastsegment;
+
 	*err_str= NULL;
 
 	/* count triangles and create mask */
@@ -762,9 +762,8 @@
 				}
 			}
 		}
-		else if(!thrownerror) {
+		else if(*err_str == NULL) {
 			*err_str= "Bone Heat Weighting: failed to find solution for one or more bones";
-			thrownerror= 1;
 			break;
 		}
 
@@ -1265,11 +1264,9 @@
 {
 	MDefBoundIsect *isect;
 	float outside[3], start[3], dir[3];
-	int i, counter;
+	int i;
 
 	for(i=1; i<=6; i++) {
-		counter = 0;
-
 		outside[0] = co[0] + (mdb->max[0] - mdb->min[0] + 1.0f)*MESHDEFORM_OFFSET[i][0];
 		outside[1] = co[1] + (mdb->max[1] - mdb->min[1] + 1.0f)*MESHDEFORM_OFFSET[i][1];
 		outside[2] = co[2] + (mdb->max[2] - mdb->min[2] + 1.0f)*MESHDEFORM_OFFSET[i][2];

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-01-08 19:42:26 UTC (rev 34182)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-01-09 01:17:56 UTC (rev 34183)
@@ -3757,13 +3757,13 @@
 	Scopes *scopes = (Scopes *)but->poin;
 	rcti rect;
 	int changed= 1;
-	float dx, dy;
+	/* float dx, dy; */
 
 	rect.xmin= but->x1; rect.xmax= but->x2;
 	rect.ymin= but->y1; rect.ymax= but->y2;
 
-	dx = mx - data->draglastx;
-	dy = my - data->draglasty;
+	/* dx = mx - data->draglastx; */
+	/* dy = my - data->draglasty; */
 
 	if (in_scope_resize_zone(but, data->dragstartx, data->dragstarty)) {
 		 /* resize vectorscope widget itself */
@@ -5679,7 +5679,6 @@
 						(event->ctrl == FALSE) &&
 						(event->oskey == FALSE)
 					) {
-						count= 0;
 						for(but= block->buttons.first; but; but= but->next) {
 
 							if(but->menu_key==event->type) {

Modified: trunk/blender/source/blender/editors/interface/view2d.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d.c	2011-01-08 19:42:26 UTC (rev 34182)
+++ trunk/blender/source/blender/editors/interface/view2d.c	2011-01-09 01:17:56 UTC (rev 34183)
@@ -1110,7 +1110,6 @@
 
 	View2DGrid *grid;
 	float space, pixels, seconddiv;
-	int secondgrid;
 	
 	/* check that there are at least some workable args */
 	if (ELEM(V2D_ARG_DUMMY, xunits, xclamp) && ELEM(V2D_ARG_DUMMY, yunits, yclamp))
@@ -1121,11 +1120,9 @@
 	
 	/* rule: gridstep is minimal GRIDSTEP pixels */
 	if (xunits == V2D_UNIT_SECONDS) {
-		secondgrid= 1;
 		seconddiv= (float)(0.01 * FPS);
 	}
 	else {
-		secondgrid= 0;
 		seconddiv= 1.0f;
 	}
 	

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2011-01-08 19:42:26 UTC (rev 34182)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2011-01-09 01:17:56 UTC (rev 34183)
@@ -1198,13 +1198,13 @@
 	EditVert *eve,*nextve;
 	EditEdge *eed,*nexted;
 	int count;
-	const char *str="Erase";
+	/* const char *str="Erase"; */
 
 
 	if(event<1) return;
 
 	if(event==10 ) {
-		str= "Erase Vertices";
+		/* str= "Erase Vertices"; */
 		erase_edges(em, &em->edges);
 		erase_faces(em, &em->faces);
 		erase_vertices(em, &em->verts);
@@ -1213,10 +1213,10 @@
 		if(!EdgeLoopDelete(em, op))
 			return;
 
-		str= "Erase Edge Loop";
+		/* str= "Erase Edge Loop"; */
 	}
 	else if(event==4) {
-		str= "Erase Edges & Faces";
+		/* str= "Erase Edges & Faces"; */
 		efa= em->faces.first;
 		while(efa) {
 			nextvl= efa->next;
@@ -1258,7 +1258,7 @@
 		}
 	}
 	else if(event==1) {
-		str= "Erase Edges";
+		/* str= "Erase Edges"; */
 		// faces first
 		efa= em->faces.first;
 		while(efa) {
@@ -1303,18 +1303,18 @@
 
 	}
 	else if(event==2) {
-		str="Erase Faces";
+		/* str="Erase Faces"; */
 		delfaceflag(em, SELECT);
 	}
 	else if(event==3) {
-		str= "Erase All";
+		/* str= "Erase All"; */
 		if(em->verts.first) free_vertlist(em, &em->verts);
 		if(em->edges.first) free_edgelist(em, &em->edges);
 		if(em->faces.first) free_facelist(em, &em->faces);
 		if(em->selected.first) BLI_freelistN(&(em->selected));
 	}
 	else if(event==5) {
-		str= "Erase Only Faces";
+		/* str= "Erase Only Faces"; */
 		efa= em->faces.first;
 		while(efa) {
 			nextvl= efa->next;
@@ -1685,7 +1685,7 @@
 	EditEdge *cedge[2]={NULL, NULL};
 	EditVert *v[4], **verts[2];
 	EditFace *hold;
-	short start=0, end, left, right, vertsize,i;
+	short start=0, /*end,*/ left, /* right,*/ vertsize,i;
 
 	v[0] = efa->v1;
 	v[1] = efa->v2;
@@ -1706,9 +1706,9 @@
 	// the array to the correct direction
 
 	if(verts[0][0] != v[start]) {flipvertarray(verts[0],numcuts+2);}
-	end	= (start+1)%4;
+	/* end	= (start+1)%4; */ /* UNUSED */
 	left   = (start+2)%4;
-	right  = (start+3)%4;
+	/* right  = (start+3)%4; */ /* UNUSED */
 	if(verts[1][0] != v[left]) {flipvertarray(verts[1],numcuts+2);}
 	/*
 	We should have something like this now

Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_ops.c	2011-01-08 19:42:26 UTC (rev 34182)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c	2011-01-09 01:17:56 UTC (rev 34183)
@@ -261,7 +261,6 @@
 {
 	ARegion *ar= CTX_wm_region(C);
 	SpaceFile *sfile= CTX_wm_space_file(C);
-	short val;
 	rcti rect;
 	int extend = RNA_boolean_get(op->ptr, "extend");
 	int fill = RNA_boolean_get(op->ptr, "fill");
@@ -271,7 +270,6 @@
 
 	rect.xmin = rect.xmax = event->x - ar->winrct.xmin;
 	rect.ymin = rect.ymax = event->y - ar->winrct.ymin;
-	val = event->val;
 
 	if(!BLI_in_rcti(&ar->v2d.mask, rect.xmin, rect.ymin))
 		return OPERATOR_CANCELLED;

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c	2011-01-08 19:42:26 UTC (rev 34182)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2011-01-09 01:17:56 UTC (rev 34183)
@@ -5039,9 +5039,9 @@
 					else {
 						set_col_actuator(act->type, 1);
 						glRecti((short)(xco+22), yco, (short)(xco+width-22),(short)(yco+19));
-						but= uiDefBut(block, LABEL, 0, actuator_name(act->type), (short)(xco+22), yco, 90, UI_UNIT_Y, act, 0, 0, 0, 0, "Actuator type");
+						/* but= */ uiDefBut(block, LABEL, 0, actuator_name(act->type), (short)(xco+22), yco, 90, UI_UNIT_Y, act, 0, 0, 0, 0, "Actuator type");
 						// uiButSetFunc(but, old_sca_move_actuator, act, NULL);
-						but= uiDefBut(block, LABEL, 0, act->name, (short)(xco+112), yco, (short)(width-(pin?156:134)), UI_UNIT_Y, act, 0, 0, 0, 0, "Actuator name");
+						/* but= */ uiDefBut(block, LABEL, 0, act->name, (short)(xco+112), yco, (short)(width-(pin?156:134)), UI_UNIT_Y, act, 0, 0, 0, 0, "Actuator name");
 						// uiButSetFunc(but, old_sca_move_actuator, act, NULL);
 
 						uiBlockBeginAlign(block);

Modified: trunk/blender/source/blender/editors/space_nla/nla_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_buttons.c	2011-01-08 19:42:26 UTC (rev 34182)
+++ trunk/blender/source/blender/editors/space_nla/nla_buttons.c	2011-01-09 01:17:56 UTC (rev 34183)
@@ -212,7 +212,7 @@
 static void nla_panel_animdata (const bContext *C, Panel *pa)
 {
 	PointerRNA adt_ptr;
-	AnimData *adt;

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list