diff options
| -rwxr-xr-x | source/blender/editors/mesh/knifetool.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_draw.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_unwrap_ops.c | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 4 |
7 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/editors/mesh/knifetool.c b/source/blender/editors/mesh/knifetool.c index 22181f12c59..7010fff962d 100755 --- a/source/blender/editors/mesh/knifetool.c +++ b/source/blender/editors/mesh/knifetool.c @@ -799,7 +799,7 @@ static BMEdgeHit *knife_edge_tri_isect(knifetool_opdata *kcd, BMBVHTree *bmtree, BMLoop *l1 = ls[j]; BMFace *hitf; ListBase *lst = knife_get_face_kedges(kcd, l1->f); - Ref *ref, *ref2; + Ref *ref; for (ref=lst->first; ref; ref=ref->next) { KnifeEdge *kfe = ref->ref; diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index b224f99819b..76074b84136 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2459,7 +2459,7 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, BMFace *f; int n; -#define DRAW_EM_MEASURE_STATS_FACEAREA(void)\ +#define DRAW_EM_MEASURE_STATS_FACEAREA()\ if (BM_TestHFlag(f, BM_SELECT)) {\ mul_v3_fl(vmid, 1.0/n);\ if(unit->system)\ diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 112c2312c0f..e9797ef25a7 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -485,7 +485,6 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) unsigned char col1[4], col2[4]; float pointsize; int drawfaces, interpedges; - int i; Image *ima= sima->image; em= me->edit_btmesh; diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index befb71ce942..e182c1c7c6e 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -2351,7 +2351,7 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje BMFace *efa; BMLoop *l; BMIter iter, liter; - MTexPoly *tf; + /* MTexPoly *tf; */ if((ts->uv_flag & UV_SYNC_SELECTION)==0 && sima->sticky == SI_STICKY_VERTEX) { /* Tag all verts as untouched, then touch the ones that have a face center diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 1541d1235c6..b622371f91d 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -147,7 +147,6 @@ static int uvedit_have_selection(Scene *scene, BMEditMesh *em, short implicit) BMFace *efa; BMLoop *l; BMIter iter, liter; - MTexPoly *tf; MLoopUV *luv; /* verify if we have any selected uv's before unwrapping, diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 5d0c1db572d..488e61d0e25 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -292,7 +292,7 @@ static void rna_Curve_dimension_set(PointerRNA *ptr, int value) } } -static EnumPropertyItem *rna_Curve_fill_mode_itemf(bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free) +static const EnumPropertyItem *rna_Curve_fill_mode_itemf(bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free) { Curve *cu= (Curve*)ptr->id.data; diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 615913a3333..4895ba3d641 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1818,10 +1818,10 @@ static void rna_def_mesh_loops(BlenderRNA *brna, PropertyRNA *cprop) { StructRNA *srna; - PropertyRNA *prop; + /*PropertyRNA *prop;*/ FunctionRNA *func; -// PropertyRNA *parm; + /*PropertyRNA *parm;*/ RNA_def_property_srna(cprop, "MeshLoops"); srna= RNA_def_struct(brna, "MeshLoops", NULL); |