Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-10-04 21:47:58 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-10-04 21:47:58 +0400
commit0b1cf4c2ea2cf009e1991c8d258603538621aeeb (patch)
tree9ed11a7301bb8f930ca4e00724e6eed699c5713d /source/blender
parent5dc9db3533e720f09c9a66e9489056ae00e1c394 (diff)
code cleanup: warnings and minor edits.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenlib/intern/math_geom.c2
-rw-r--r--source/blender/bmesh/intern/bmesh_iterators.c1
-rw-r--r--source/blender/bmesh/tools/bmesh_bisect_plane.c3
-rw-r--r--source/blender/editors/mesh/editmesh_tools.c6
-rw-r--r--source/blender/makesrna/intern/rna_mesh_api.c2
5 files changed, 3 insertions, 11 deletions
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index ce36d1f9fc3..148aa62ee1a 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -2012,7 +2012,7 @@ void fill_poly_v2i_n(
/* Build a list of nodes. */
nodes = 0; j = nr - 1;
- for (i=0; i<nr; i++) {
+ for (i = 0; i < nr; i++) {
if ((verts[i][1] < pixel_y && verts[j][1] >= pixel_y) ||
(verts[j][1] < pixel_y && verts[i][1] >= pixel_y))
{
diff --git a/source/blender/bmesh/intern/bmesh_iterators.c b/source/blender/bmesh/intern/bmesh_iterators.c
index 6449a6e6d35..91b9774634d 100644
--- a/source/blender/bmesh/intern/bmesh_iterators.c
+++ b/source/blender/bmesh/intern/bmesh_iterators.c
@@ -73,6 +73,7 @@ int BM_iter_mesh_count(BMesh *bm, const char itype)
default:
count = 0;
BLI_assert(0);
+ break;
}
return count;
diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c
index 4633d0db788..9cfe17d6413 100644
--- a/source/blender/bmesh/tools/bmesh_bisect_plane.c
+++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c
@@ -121,9 +121,6 @@ static void bm_face_bisect_verts(BMesh *bm, BMFace *f, const float plane[4], con
l_first = BM_FACE_FIRST_LOOP(f);
- (void)bm;
- (void)plane;
-
/* add plane-aligned verts to the stack
* and check we have verts from both sides in this face,
* ... that the face doesn't only have boundry verts on the plane for eg. */
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 6cdcc3c0732..fa65fb88315 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -983,12 +983,6 @@ void MESH_OT_flip_normals(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
-static const EnumPropertyItem direction_items[] = {
- {false, "CW", 0, "Clockwise", ""},
- {true, "CCW", 0, "Counter Clockwise", ""},
- {0, NULL, 0, NULL, NULL}
-};
-
/* only accepts 1 selected edge, or 2 selected faces */
static int edbm_edge_rotate_selected_exec(bContext *C, wmOperator *op)
{
diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c
index 3fa101a74e4..a25f56f2259 100644
--- a/source/blender/makesrna/intern/rna_mesh_api.c
+++ b/source/blender/makesrna/intern/rna_mesh_api.c
@@ -130,7 +130,7 @@ void RNA_api_mesh(StructRNA *srna)
parm = RNA_def_float(func, "split_angle", M_PI, 0.0f, M_PI, "",
"Angle between polys' normals above which an edge is always sharp (180° to disable)",
0.0f, M_PI);
- RNA_def_property_subtype(parm, PROP_UNIT_ROTATION);
+ RNA_def_property_subtype(parm, (PropertySubType)PROP_UNIT_ROTATION);
func = RNA_def_function(srna, "free_normals_split", "rna_Mesh_free_normals_split");
RNA_def_function_ui_description(func, "Free split vertex normals");