[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34250] trunk/blender: remove misc unused vars and correct theme name for face angles.
Campbell Barton
ideasman42 at gmail.com
Tue Jan 11 08:40:32 CET 2011
Revision: 34250
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34250
Author: campbellbarton
Date: 2011-01-11 07:40:31 +0000 (Tue, 11 Jan 2011)
Log Message:
-----------
remove misc unused vars and correct theme name for face angles.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenlib/intern/freetypefont.c
trunk/blender/source/blender/blenlib/intern/scanfill.c
trunk/blender/source/blender/blenlib/intern/storage.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/render/intern/source/renderdatabase.c
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2011-01-11 07:38:16 UTC (rev 34249)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2011-01-11 07:40:31 UTC (rev 34250)
@@ -2117,7 +2117,7 @@
col.separator()
col.label(text="Numerics:")
col.prop(mesh, "show_extra_edge_length")
- col.prop(mesh, "show_extra_edge_angle")
+ col.prop(mesh, "show_extra_face_angle")
col.prop(mesh, "show_extra_face_area")
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2011-01-11 07:38:16 UTC (rev 34249)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2011-01-11 07:40:31 UTC (rev 34250)
@@ -728,10 +728,8 @@
if (sce) {
seq->scene = sce;
- } else {
- sce = seq->scene;
}
-
+
seq->len= seq->scene->r.efra - seq->scene->r.sfra + 1;
seq->len -= seq->anim_startofs;
seq->len -= seq->anim_endofs;
@@ -3386,7 +3384,6 @@
Scene *scene= CTX_data_scene(C); /* only for active seq */
Sequence *seq;
Strip *strip;
- StripElem *se;
seq = alloc_sequence(seqbasep, seq_load->start_frame, seq_load->channel);
seq->type= SEQ_IMAGE;
@@ -3397,7 +3394,7 @@
strip->len = seq->len = seq_load->len ? seq_load->len : 1;
strip->us= 1;
- strip->stripdata= se= MEM_callocN(seq->len*sizeof(StripElem), "stripelem");
+ strip->stripdata= MEM_callocN(seq->len*sizeof(StripElem), "stripelem");
BLI_strncpy(strip->dir, seq_load->path, sizeof(strip->dir));
seq_load_apply(scene, seq, seq_load);
@@ -3467,7 +3464,7 @@
Scene *scene= CTX_data_scene(C); /* only for sound */
char path[sizeof(seq_load->path)];
- Sequence *seq, *soundseq; /* generic strip vars */
+ Sequence *seq; /* generic strip vars */
Strip *strip;
StripElem *se;
@@ -3506,7 +3503,7 @@
int start_frame_back= seq_load->start_frame;
seq_load->channel++;
- soundseq = sequencer_add_sound_strip(C, seqbasep, seq_load);
+ sequencer_add_sound_strip(C, seqbasep, seq_load);
seq_load->start_frame= start_frame_back;
seq_load->channel--;
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2011-01-11 07:38:16 UTC (rev 34249)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2011-01-11 07:40:31 UTC (rev 34250)
@@ -2218,7 +2218,6 @@
} while (mrk && mrk->lineno==lineno);
}
if (lineno==-1) lineno= txt_get_span(text->lines.first, lineb);
- if (!mrk) mrk= text->markers.first;
tmp= MEM_mallocN(linea->len+lineb->len+1, "textline_string");
Modified: trunk/blender/source/blender/blenlib/intern/freetypefont.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/freetypefont.c 2011-01-11 07:38:16 UTC (rev 34249)
+++ trunk/blender/source/blender/blenlib/intern/freetypefont.c 2011-01-11 07:40:31 UTC (rev 34250)
@@ -127,7 +127,6 @@
// get number of on-curve points for beziertriples (including conic virtual on-points)
for(j = 0; j < ftoutline.n_contours; j++) {
- l = 0;
for(k = 0; k < npoints[j]; k++) {
if(j > 0) l = k + ftoutline.contours[j - 1] + 1; else l = k;
if(ftoutline.tags[l] == FT_Curve_Tag_On)
Modified: trunk/blender/source/blender/blenlib/intern/scanfill.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/scanfill.c 2011-01-11 07:38:16 UTC (rev 34249)
+++ trunk/blender/source/blender/blenlib/intern/scanfill.c 2011-01-11 07:40:31 UTC (rev 34250)
@@ -499,9 +499,9 @@
short nr, test, twoconnected=0;
nr= pf->nr;
- verts= pf->verts;
/* PRINTS
+ verts= pf->verts;
eve= fillvertbase.first;
while(eve) {
printf("vert: %x co: %f %f\n",eve,eve->co[cox],eve->co[coy]);
@@ -558,7 +558,6 @@
qsort(scdata, verts, sizeof(ScFillVert), vergscdata);
- sc= scdata;
eed= filledgebase.first;
while(eed) {
nexted= eed->next;
@@ -1005,8 +1004,8 @@
MEM_freeN(polycache);
}
- pf= pflist;
/* printf("after merge\n");
+ pf= pflist;
for(a=1;a<=poly;a++) {
printf("poly:%d edges:%d verts:%d flag: %d\n",a,pf->edges,pf->verts,pf->f);
pf++;
Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/storage.c 2011-01-11 07:38:16 UTC (rev 34249)
+++ trunk/blender/source/blender/blenlib/intern/storage.c 2011-01-11 07:40:31 UTC (rev 34250)
@@ -206,7 +206,7 @@
{
struct dirent *fname;
struct dirlink *dlink;
- int rellen, newnum = 0, len;
+ int rellen, newnum = 0;
char buf[256];
DIR *dir;
@@ -225,8 +225,6 @@
if ( (dir = (DIR *)opendir(".")) ){
while ((fname = (struct dirent*) readdir(dir)) != NULL) {
- len= strlen(fname->d_name);
-
dlink = (struct dirlink *)malloc(sizeof(struct dirlink));
if (dlink){
strcpy(buf+rellen,fname->d_name);
Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2011-01-11 07:38:16 UTC (rev 34249)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2011-01-11 07:40:31 UTC (rev 34250)
@@ -1994,9 +1994,9 @@
RNA_def_property_ui_text(prop, "Edge Length", "Displays selected edge lengths, Using global values when set in the transform panel");
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
- prop= RNA_def_property(srna, "show_extra_edge_angle", PROP_BOOLEAN, PROP_NONE);
+ prop= RNA_def_property(srna, "show_extra_face_angle", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEXTRA_FACEANG);
- RNA_def_property_ui_text(prop, "Edge Angles", "Displays the angles in the selected edges in degrees, Using global values when set in the transform panel");
+ RNA_def_property_ui_text(prop, "Faces Angles", "Displays the angles in the selected edges in degrees, Using global values when set in the transform panel");
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
prop= RNA_def_property(srna, "show_extra_face_area", PROP_BOOLEAN, PROP_NONE);
Modified: trunk/blender/source/blender/render/intern/source/renderdatabase.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/renderdatabase.c 2011-01-11 07:38:16 UTC (rev 34249)
+++ trunk/blender/source/blender/render/intern/source/renderdatabase.c 2011-01-11 07:40:31 UTC (rev 34250)
@@ -295,7 +295,7 @@
if(verify) {
if(n>=node->totmtface) {
MTFace *mtface= node->mtface;
- int size= size= (n+1)*256;
+ int size= (n+1)*256;
node->mtface= MEM_callocN(size*sizeof(MTFace), "Vlak mtface");
More information about the Bf-blender-cvs
mailing list