[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43930] branches/bmesh/blender/source/ blender/editors: Code Cleanup: comment, remove or use unused functions.
Campbell Barton
ideasman42 at gmail.com
Mon Feb 6 10:39:59 CET 2012
Revision: 43930
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43930
Author: campbellbarton
Date: 2012-02-06 09:39:47 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
Code Cleanup: comment, remove or use unused functions.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/editors/mesh/editface.c
branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
Modified: branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/include/ED_mesh.h 2012-02-06 06:56:54 UTC (rev 43929)
+++ branches/bmesh/blender/source/blender/editors/include/ED_mesh.h 2012-02-06 09:39:47 UTC (rev 43930)
@@ -153,6 +153,8 @@
edges select/deselect faces and vertices, and in face select mode faces select/deselect
edges and vertices.*/
void EDBM_selectmode_flush(struct BMEditMesh *em);
+void EDBM_select_more(struct BMEditMesh *em);
+void EDBM_select_less(struct BMEditMesh *em);
int EDBM_get_actSelection(struct BMEditMesh *em, struct BMEditSelection *ese);
@@ -202,6 +204,7 @@
void EDBM_toggle_select_all(struct BMEditMesh *em);
void EDBM_set_flag_all(struct BMEditMesh *em, const char hflag);
void EDBM_clear_flag_all(struct BMEditMesh *em, const char hflag);
+void EDBM_select_mirrored(struct Object *obedit, struct BMEditMesh *em, int extend);
void EDBM_automerge(struct Scene *scene, struct Object *ob, int update);
/* editmesh_mods.c */
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c 2012-02-06 06:56:54 UTC (rev 43929)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c 2012-02-06 09:39:47 UTC (rev 43930)
@@ -96,25 +96,36 @@
/* ****************************** MIRROR **************** */
-static void EDBM_select_mirrored(Object *obedit, BMEditMesh *em)
+void EDBM_select_mirrored(Object *UNUSED(obedit), BMEditMesh *em, int extend)
{
- if (em->selectmode & SCE_SELECT_VERTEX) {
- BMVert *eve, *v1;
- BMIter iter;
- int i;
+ BMVert *v1, *v2;
+ BMIter iter;
- i= 0;
- BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
- if (BM_TestHFlag(eve, BM_SELECT) && !BM_TestHFlag(eve, BM_HIDDEN)) {
- v1= editbmesh_get_x_mirror_vert(obedit, em, eve, eve->co, i);
- if (v1) {
- BM_Select(em->bm, eve, FALSE);
- BM_Select(em->bm, v1, TRUE);
- }
- }
- i++;
+ BM_ITER(v1, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+ if (!BM_TestHFlag(v1, BM_SELECT) || BM_TestHFlag(v1, BM_HIDDEN)) {
+ BM_ClearHFlag(v1, BM_TMP_TAG);
}
+ else {
+ BM_SetHFlag(v1, BM_TMP_TAG);
+ }
}
+
+ EDBM_CacheMirrorVerts(em, TRUE);
+
+ if (!extend)
+ EDBM_clear_flag_all(em, BM_SELECT);
+
+ BM_ITER(v1, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+ if (!BM_TestHFlag(v1, BM_TMP_TAG) || BM_TestHFlag(v1, BM_HIDDEN))
+ continue;
+
+ v2= EDBM_GetMirrorVert(em, v1);
+ if (v2 && !BM_TestHFlag(v2, BM_HIDDEN)) {
+ BM_Select(em->bm, v2, TRUE);
+ }
+ }
+
+ EDBM_EndMirrorCache(em);
}
void EDBM_automerge(Scene *scene, Object *obedit, int update)
@@ -1898,24 +1909,13 @@
/* ******************** **************** */
-static int select_more(bContext *C, wmOperator *op)
+static int select_more(bContext *C, wmOperator *UNUSED(op))
{
Object *obedit= CTX_data_edit_object(C);
BMEditMesh *em= (((Mesh *)obedit->data))->edit_btmesh;
- BMOperator bmop;
- int usefaces = em->selectmode > SCE_SELECT_EDGE;
- EDBM_InitOpf(em, &bmop, op, "regionextend geom=%hvef constrict=%d usefaces=%d",
- BM_SELECT, 0, usefaces);
+ EDBM_select_more(em);
- BMO_Exec_Op(em->bm, &bmop);
- BMO_HeaderFlag_Buffer(em->bm, &bmop, "geomout", BM_SELECT, BM_ALL);
-
- EDBM_selectmode_flush(em);
-
- if (!EDBM_FinishOp(em, &bmop, op, 1))
- return OPERATOR_CANCELLED;
-
WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit);
return OPERATOR_FINISHED;
}
@@ -1935,24 +1935,13 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
-static int select_less(bContext *C, wmOperator *op)
+static int select_less(bContext *C, wmOperator *UNUSED(op))
{
Object *obedit= CTX_data_edit_object(C);
BMEditMesh *em= (((Mesh *)obedit->data))->edit_btmesh;
- BMOperator bmop;
- int usefaces = em->selectmode > SCE_SELECT_EDGE;
- EDBM_InitOpf(em, &bmop, op, "regionextend geom=%hvef constrict=%d usefaces=%d",
- BM_SELECT, 1, usefaces);
+ EDBM_select_less(em);
- BMO_Exec_Op(em->bm, &bmop);
- BMO_UnHeaderFlag_Buffer(em->bm, &bmop, "geomout", BM_SELECT, BM_ALL);
-
- EDBM_selectmode_flush(em);
-
- if (!EDBM_FinishOp(em, &bmop, op, 1))
- return OPERATOR_CANCELLED;
-
WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit);
return OPERATOR_FINISHED;
}
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c 2012-02-06 06:56:54 UTC (rev 43929)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c 2012-02-06 09:39:47 UTC (rev 43930)
@@ -1041,64 +1041,8 @@
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-
}
-static EnumPropertyItem prop_mesh_edit_types[] = {
- {1, "VERT", 0, "Vertices", ""},
- {2, "EDGE", 0, "Edges", ""},
- {3, "FACE", 0, "Faces", ""},
- {0, NULL, 0, NULL, NULL}
-};
-
-static int mesh_selection_type_exec(bContext *C, wmOperator *op)
-{
-
- Object *obedit= CTX_data_edit_object(C);
- BMEditMesh *em= ((Mesh *)obedit->data)->edit_btmesh;
- int type = RNA_enum_get(op->ptr,"type");
-
- switch (type) {
- case 1:
- em->selectmode = SCE_SELECT_VERTEX;
- break;
- case 2:
- em->selectmode = SCE_SELECT_EDGE;
- break;
- case 3:
- em->selectmode = SCE_SELECT_FACE;
- break;
- }
-
- EDBM_selectmode_set(em);
- CTX_data_tool_settings(C)->selectmode = em->selectmode;
-
- WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit);
-
- return OPERATOR_FINISHED;
-}
-
-static void MESH_OT_selection_type(wmOperatorType *ot)
-{
- /* identifiers */
- ot->name= "Selection Mode";
- ot->description= "Set the selection mode type";
- ot->idname= "MESH_OT_selection_type";
-
- /* api callbacks */
- ot->invoke= WM_menu_invoke;
- ot->exec= mesh_selection_type_exec;
-
- ot->poll= ED_operator_editmesh;
-
- /* flags */
- ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-
- /* props */
- RNA_def_enum(ot->srna, "type", prop_mesh_edit_types, 0, "Type", "Set the mesh selection type");
- RNA_def_boolean(ot->srna, "inclusive", 0, "Inclusive", "Selects geometry around selected geometry, occording to selection mode");
-}
-
/* ************************* SEAMS AND EDGES **************** */
static int editbmesh_mark_seam(bContext *C, wmOperator *op)
@@ -3958,43 +3902,16 @@
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
}
-#define MIRROR_THRESH 1.0f
-
static int select_mirror_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
BMEditMesh *em= ((Mesh *)obedit->data)->edit_btmesh;
- BMVert *v1, *v2;
- BMIter iter;
int extend= RNA_boolean_get(op->ptr, "extend");
- BM_ITER(v1, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
- if (!BM_TestHFlag(v1, BM_SELECT) || BM_TestHFlag(v1, BM_HIDDEN)) {
- BM_ClearHFlag(v1, BM_TMP_TAG);
- }
- else {
- BM_SetHFlag(v1, BM_TMP_TAG);
- }
- }
-
- EDBM_CacheMirrorVerts(em, TRUE);
-
- if (!extend)
- EDBM_clear_flag_all(em, BM_SELECT);
-
- BM_ITER(v1, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
- if (!BM_TestHFlag(v1, BM_TMP_TAG) || BM_TestHFlag(v1, BM_HIDDEN))
- continue;
-
- v2= EDBM_GetMirrorVert(em, v1);
- if (v2 && !BM_TestHFlag(v2, BM_HIDDEN)) {
- BM_Select(em->bm, v2, TRUE);
- }
- }
-
- EDBM_EndMirrorCache(em);
-
+ EDBM_select_mirrored(obedit, em, extend);
+ EDBM_selectmode_flush(em);
WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
+
return OPERATOR_FINISHED;
}
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c 2012-02-06 06:56:54 UTC (rev 43929)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c 2012-02-06 09:39:47 UTC (rev 43930)
@@ -434,9 +434,7 @@
BM_SelectMode_Flush(em->bm);
}
-/*EDBM_select_[more/less] are api functions, I think the uv editor
- uses them? though the select more/less ops themselves do not.*/
-static void EDBM_select_more(BMEditMesh *em)
+void EDBM_select_more(BMEditMesh *em)
{
BMOperator bmop;
int usefaces = em->selectmode > SCE_SELECT_EDGE;
@@ -451,7 +449,7 @@
EDBM_selectmode_flush(em);
}
-static void EDBM_select_less(BMEditMesh *em)
+void EDBM_select_less(BMEditMesh *em)
{
BMOperator bmop;
int usefaces = em->selectmode > SCE_SELECT_EDGE;
Modified: branches/bmesh/blender/source/blender/editors/mesh/editface.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/editface.c 2012-02-06 06:56:54 UTC (rev 43929)
+++ branches/bmesh/blender/source/blender/editors/mesh/editface.c 2012-02-06 09:39:47 UTC (rev 43930)
@@ -162,26 +162,6 @@
return 1;
}
-/* last_sel, use em->act_face otherwise get the last selected face in the editselections
- * at the moment, last_sel is mainly useful for gaking sure the space image dosnt flicker */
-static MTexPoly *EDBM_get_active_mtface(BMEditMesh *em, BMFace **act_efa, int sloppy)
-{
- BMFace *efa = NULL;
-
- if(!EDBM_texFaceCheck(em))
- return NULL;
-
- efa = BM_get_actFace(em->bm, sloppy);
-
- if (efa) {
- if (act_efa) *act_efa = efa;
- return CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
- }
-
- if (act_efa) *act_efa= NULL;
- return NULL;
-}
-
void paintface_hide(Object *ob, const int unselected)
{
Mesh *me;
@@ -422,26 +402,6 @@
}
}
-static void selectswap_tface(Scene *scene)
-{
- Mesh *me;
- MPoly *mface;
- int a;
-
- me= get_mesh(OBACT);
- if(me==0) return;
-
- mface= me->mpoly;
- a= me->totpoly;
- while(a--) {
- if(mface->flag & ME_HIDE);
- else {
- if(mface->flag & ME_FACE_SEL) mface->flag &= ~ME_FACE_SEL;
- else mface->flag |= ME_FACE_SEL;
- }
- }
-}
-
int paintface_minmax(Object *ob, float *min, float *max)
{
Mesh *me;
Modified: branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/meshtools.c 2012-02-06 06:56:54 UTC (rev 43929)
+++ branches/bmesh/blender/source/blender/editors/mesh/meshtools.c 2012-02-06 09:39:47 UTC (rev 43930)
@@ -1007,14 +1007,16 @@
BMVert *editbmesh_get_x_mirror_vert(Object *ob, struct BMEditMesh *em, BMVert *eve, float *co, int index)
{
- //BMESH_TODO use this flag, ME_EDIT_MIRROR_TOPO, at appropriate places
if (((Mesh *)ob->data)->editflag & ME_EDIT_MIRROR_TOPO) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list