[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45115] trunk/blender/source/blender/ editors/mesh: code cleanup: more consistent naming for mesh operator functions.
Campbell Barton
ideasman42 at gmail.com
Fri Mar 23 22:25:21 CET 2012
Revision: 45115
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45115
Author: campbellbarton
Date: 2012-03-23 21:25:07 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
code cleanup: more consistent naming for mesh operator functions.
Modified Paths:
--------------
trunk/blender/source/blender/editors/mesh/bmesh_select.c
trunk/blender/source/blender/editors/mesh/bmesh_tools.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/mesh/mesh_intern.h
trunk/blender/source/blender/editors/mesh/mesh_navmesh.c
Modified: trunk/blender/source/blender/editors/mesh/bmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/bmesh_select.c 2012-03-23 20:50:38 UTC (rev 45114)
+++ trunk/blender/source/blender/editors/mesh/bmesh_select.c 2012-03-23 21:25:07 UTC (rev 45115)
@@ -811,7 +811,7 @@
return OPERATOR_FINISHED;
}
-static int select_similar_exec(bContext *C, wmOperator *op)
+static int edbm_select_similar_exec(bContext *C, wmOperator *op)
{
ToolSettings *ts = CTX_data_tool_settings(C);
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "threshold");
@@ -875,7 +875,7 @@
/* api callbacks */
ot->invoke = WM_menu_invoke;
- ot->exec = select_similar_exec;
+ ot->exec = edbm_select_similar_exec;
ot->poll = ED_operator_editmesh;
ot->description = "Select similar vertices, edges or faces by property types";
@@ -912,7 +912,7 @@
BMW_end(&walker);
}
-static int loop_multiselect(bContext *C, wmOperator *op)
+static int edbm_loop_multiselect_exec(bContext *C, wmOperator *op)
{
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
@@ -976,7 +976,7 @@
ot->idname = "MESH_OT_loop_multi_select";
/* api callbacks */
- ot->exec = loop_multiselect;
+ ot->exec = edbm_loop_multiselect_exec;
ot->poll = ED_operator_editmesh;
ot->description = "Select a loop of connected edges by connection type";
@@ -1062,7 +1062,7 @@
}
}
-static int mesh_select_loop_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int edbm_select_loop_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
view3d_operator_needs_opengl(C);
@@ -1082,7 +1082,7 @@
ot->description = "Select a loop";
/* api callbacks */
- ot->invoke = mesh_select_loop_invoke;
+ ot->invoke = edbm_select_loop_invoke;
ot->poll = ED_operator_editmesh_region_view3d;
ot->description = "Select a loop of connected edges";
@@ -1102,7 +1102,7 @@
ot->description = "Select an edge ring";
/* callbacks */
- ot->invoke = mesh_select_loop_invoke;
+ ot->invoke = edbm_select_loop_invoke;
ot->poll = ED_operator_editmesh_region_view3d;
/* flags */
@@ -1417,7 +1417,7 @@
}
-static int mesh_shortest_path_select_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *event)
+static int edbm_shortest_path_select_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *event)
{
view3d_operator_needs_opengl(C);
@@ -1434,7 +1434,7 @@
ot->idname = "MESH_OT_select_shortest_path";
/* api callbacks */
- ot->invoke = mesh_shortest_path_select_invoke;
+ ot->invoke = edbm_shortest_path_select_invoke;
ot->poll = ED_operator_editmesh;
ot->description = "Select shortest path between two selections";
@@ -1739,7 +1739,7 @@
}
}
-static int select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int edbm_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
Object *obedit = CTX_data_edit_object(C);
ViewContext vc;
@@ -1838,7 +1838,7 @@
ot->idname = "MESH_OT_select_linked_pick";
/* api callbacks */
- ot->invoke = select_linked_pick_invoke;
+ ot->invoke = edbm_select_linked_pick_invoke;
ot->poll = ED_operator_editmesh;
ot->description = "(De)select all vertices linked to the edge under the mouse cursor";
@@ -1850,7 +1850,7 @@
}
-static int select_linked_exec(bContext *C, wmOperator *op)
+static int edbm_select_linked_exec(bContext *C, wmOperator *op)
{
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
@@ -1933,7 +1933,7 @@
ot->idname = "MESH_OT_select_linked";
/* api callbacks */
- ot->exec = select_linked_exec;
+ ot->exec = edbm_select_linked_exec;
ot->poll = ED_operator_editmesh;
ot->description = "Select all vertices linked to the active mesh";
@@ -1945,7 +1945,7 @@
/* ******************** **************** */
-static int select_more(bContext *C, wmOperator *UNUSED(op))
+static int edbm_select_more_exec(bContext *C, wmOperator *UNUSED(op))
{
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
@@ -1964,14 +1964,14 @@
ot->description = "Select more vertices, edges or faces connected to initial selection";
/* api callbacks */
- ot->exec = select_more;
+ ot->exec = edbm_select_more_exec;
ot->poll = ED_operator_editmesh;
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
}
-static int select_less(bContext *C, wmOperator *UNUSED(op))
+static int edbm_select_less_exec(bContext *C, wmOperator *UNUSED(op))
{
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
@@ -1990,7 +1990,7 @@
ot->description = "Deselect vertices, edges or faces at the boundary of each selection region";
/* api callbacks */
- ot->exec = select_less;
+ ot->exec = edbm_select_less_exec;
ot->poll = ED_operator_editmesh;
/* flags */
@@ -2145,7 +2145,7 @@
return 0;
}
-static int mesh_select_nth_exec(bContext *C, wmOperator *op)
+static int edbm_select_nth_exec(bContext *C, wmOperator *op)
{
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
@@ -2174,7 +2174,7 @@
ot->idname = "MESH_OT_select_nth";
/* api callbacks */
- ot->exec = mesh_select_nth_exec;
+ ot->exec = edbm_select_nth_exec;
ot->poll = ED_operator_editmesh;
/* flags */
@@ -2203,7 +2203,7 @@
}
-static int select_sharp_edges_exec(bContext *C, wmOperator *op)
+static int edbm_select_sharp_edges_exec(bContext *C, wmOperator *op)
{
/* Find edges that have exactly two neighboring faces,
* check the angle between those faces, and if angle is
@@ -2250,7 +2250,7 @@
ot->idname = "MESH_OT_edges_select_sharp";
/* api callbacks */
- ot->exec = select_sharp_edges_exec;
+ ot->exec = edbm_select_sharp_edges_exec;
ot->poll = ED_operator_editmesh;
/* flags */
@@ -2260,7 +2260,7 @@
RNA_def_float(ot->srna, "sharpness", 1.0f, 0.01f, FLT_MAX, "sharpness", "", 1.0f, 180.0f);
}
-static int select_linked_flat_faces_exec(bContext *C, wmOperator *op)
+static int edbm_select_linked_flat_faces_exec(bContext *C, wmOperator *op)
{
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
@@ -2331,7 +2331,7 @@
ot->idname = "MESH_OT_faces_select_linked_flat";
/* api callbacks */
- ot->exec = select_linked_flat_faces_exec;
+ ot->exec = edbm_select_linked_flat_faces_exec;
ot->poll = ED_operator_editmesh;
/* flags */
@@ -2341,7 +2341,7 @@
RNA_def_float(ot->srna, "sharpness", 1.0f, 0.01f, FLT_MAX, "sharpness", "", 1.0f, 180.0f);
}
-static int select_non_manifold_exec(bContext *C, wmOperator *op)
+static int edbm_select_non_manifold_exec(bContext *C, wmOperator *op)
{
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
@@ -2383,14 +2383,14 @@
ot->idname = "MESH_OT_select_non_manifold";
/* api callbacks */
- ot->exec = select_non_manifold_exec;
+ ot->exec = edbm_select_non_manifold_exec;
ot->poll = ED_operator_editmesh;
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
}
-static int mesh_select_random_exec(bContext *C, wmOperator *op)
+static int edbm_select_random_exec(bContext *C, wmOperator *op)
{
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
@@ -2443,7 +2443,7 @@
ot->idname = "MESH_OT_select_random";
/* api callbacks */
- ot->exec = mesh_select_random_exec;
+ ot->exec = edbm_select_random_exec;
ot->poll = ED_operator_editmesh;
/* flags */
@@ -2456,7 +2456,7 @@
"Extend Selection", "Extend selection instead of deselecting everything first");
}
-static int select_next_loop(bContext *C, wmOperator *UNUSED(op))
+static int edbm_select_next_loop_exec(bContext *C, wmOperator *UNUSED(op))
{
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
@@ -2498,7 +2498,7 @@
ot->description = "";
/* api callbacks */
- ot->exec = select_next_loop;
+ ot->exec = edbm_select_next_loop_exec;
ot->poll = ED_operator_editmesh;
/* flags */
@@ -2506,7 +2506,7 @@
}
-static int region_to_loop(bContext *C, wmOperator *UNUSED(op))
+static int edbm_region_to_loop_exec(bContext *C, wmOperator *UNUSED(op))
{
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
@@ -2565,7 +2565,7 @@
ot->idname = "MESH_OT_region_to_loop";
/* api callbacks */
- ot->exec = region_to_loop;
+ ot->exec = edbm_region_to_loop_exec;
ot->poll = ED_operator_editmesh;
/* flags */
@@ -2710,7 +2710,7 @@
return count;
}
-static int loop_to_region(bContext *C, wmOperator *op)
+static int edbm_loop_to_region_exec(bContext *C, wmOperator *op)
{
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
@@ -2746,7 +2746,7 @@
ot->idname = "MESH_OT_loop_to_region";
/* api callbacks */
- ot->exec = loop_to_region;
+ ot->exec = edbm_loop_to_region_exec;
ot->poll = ED_operator_editmesh;
/* flags */
Modified: trunk/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/bmesh_tools.c 2012-03-23 20:50:38 UTC (rev 45114)
+++ trunk/blender/source/blender/editors/mesh/bmesh_tools.c 2012-03-23 21:25:07 UTC (rev 45115)
@@ -63,19 +63,19 @@
#include "mesh_intern.h"
-
+/* allow accumulated normals to form a new direction but don't
+ * accept direct opposite directions else they will cancel each other out */
static void add_normal_aligned(float nor[3], const float add[3])
{
if (dot_v3v3(nor, add) < -0.9999f) {
sub_v3_v3(nor, add);
}
else {
- sub_v3_v3(nor, add);
+ add_v3_v3(nor, add);
}
}
-
-static int subdivide_exec(bContext *C, wmOperator *op)
+static int edbm_subdivide_exec(bContext *C, wmOperator *op)
{
ToolSettings *ts = CTX_data_tool_settings(C);
Object *obedit = CTX_data_edit_object(C);
@@ -128,7 +128,7 @@
ot->idname = "MESH_OT_subdivide";
/* api callbacks */
- ot->exec = subdivide_exec;
+ ot->exec = edbm_subdivide_exec;
ot->poll = ED_operator_editmesh;
/* flags */
@@ -172,7 +172,7 @@
/* individual face extrude */
/* will use vertex normals for extrusion directions, so *nor is unaffected */
-static short EDBM_Extrude_face_indiv(BMEditMesh *em, wmOperator *op, const char hflag, float *UNUSED(nor))
+static short edbm_extrude_face_indiv(BMEditMesh *em, wmOperator *op, const char hflag, float *UNUSED(nor))
{
BMOIter siter;
BMIter liter;
@@ -204,7 +204,7 @@
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list