diff options
| -rw-r--r-- | release/scripts/ui/space_view3d.py | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 11 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/text.c | 1 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/freetypefont.c | 1 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/scanfill.c | 5 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/storage.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 4 | ||||
| -rw-r--r-- | source/blender/render/intern/source/renderdatabase.c | 2 |
8 files changed, 11 insertions, 19 deletions
diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 0b935b54643..1c5a3351740 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -2117,7 +2117,7 @@ class VIEW3D_PT_view3d_meshdisplay(bpy.types.Panel): 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") diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 5f25e419eec..9ffc04c5191 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -728,10 +728,8 @@ void reload_sequence_new_file(Scene *scene, Sequence * seq, int lock_range) 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 @@ Sequence *sequencer_add_image_strip(bContext *C, ListBase *seqbasep, SeqLoadInfo 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 @@ Sequence *sequencer_add_image_strip(bContext *C, ListBase *seqbasep, SeqLoadInfo 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 @@ Sequence *sequencer_add_movie_strip(bContext *C, ListBase *seqbasep, SeqLoadInfo 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 @@ Sequence *sequencer_add_movie_strip(bContext *C, ListBase *seqbasep, SeqLoadInfo 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--; diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 0b5347ca304..20492b99048 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -2218,7 +2218,6 @@ static void txt_combine_lines (Text *text, TextLine *linea, TextLine *lineb) } 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"); diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index f63302e3cee..482ca1c01e5 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -127,7 +127,6 @@ static void freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *vf // 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) diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c index 86167078094..1978e7ed7d6 100644 --- a/source/blender/blenlib/intern/scanfill.c +++ b/source/blender/blenlib/intern/scanfill.c @@ -499,9 +499,9 @@ static void scanfill(PolyFill *pf, int mat_nr) 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 @@ static void scanfill(PolyFill *pf, int mat_nr) qsort(scdata, verts, sizeof(ScFillVert), vergscdata); - sc= scdata; eed= filledgebase.first; while(eed) { nexted= eed->next; @@ -1005,8 +1004,8 @@ int BLI_edgefill(int mat_nr) 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++; diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 6da59fd4e81..e407df7e9a1 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -206,7 +206,7 @@ void BLI_builddir(const char *dirname, const char *relname) { struct dirent *fname; struct dirlink *dlink; - int rellen, newnum = 0, len; + int rellen, newnum = 0; char buf[256]; DIR *dir; @@ -225,8 +225,6 @@ void BLI_builddir(const char *dirname, const char *relname) 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); diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 6490e4e1dfb..81bd7e881c1 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1994,9 +1994,9 @@ static void rna_def_mesh(BlenderRNA *brna) 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); diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c index 8f28419b9af..b917c1ddc92 100644 --- a/source/blender/render/intern/source/renderdatabase.c +++ b/source/blender/render/intern/source/renderdatabase.c @@ -295,7 +295,7 @@ MTFace *RE_vlakren_get_tface(ObjectRen *obr, VlakRen *vlr, int n, char **name, i 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"); |