[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49074] trunk/blender/source/blender: minor edits for bmesh api
Campbell Barton
ideasman42 at gmail.com
Fri Jul 20 11:49:55 CEST 2012
Revision: 49074
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49074
Author: campbellbarton
Date: 2012-07-20 09:49:54 +0000 (Fri, 20 Jul 2012)
Log Message:
-----------
minor edits for bmesh api
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
trunk/blender/source/blender/bmesh/intern/bmesh_marking.h
trunk/blender/source/blender/editors/include/ED_mesh.h
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/mesh/editmesh_utils.c
trunk/blender/source/blender/editors/transform/transform.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-07-20 06:34:31 UTC (rev 49073)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-07-20 09:49:54 UTC (rev 49074)
@@ -71,7 +71,7 @@
* (ie: all verts of an edge selects the edge and so on).
* This should only be called by system and not tool authors.
*/
-void BM_mesh_select_mode_flush(BMesh *bm)
+void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode)
{
BMEdge *e;
BMLoop *l_iter;
@@ -83,7 +83,7 @@
int ok;
- if (bm->selectmode & SCE_SELECT_VERTEX) {
+ if (selectmode & SCE_SELECT_VERTEX) {
BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
@@ -113,7 +113,7 @@
BM_elem_flag_set(f, BM_ELEM_SELECT, ok);
}
}
- else if (bm->selectmode & SCE_SELECT_EDGE) {
+ else if (selectmode & SCE_SELECT_EDGE) {
BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) {
ok = TRUE;
if (!BM_elem_flag_test(f, BM_ELEM_HIDDEN)) {
@@ -139,6 +139,11 @@
recount_totsels(bm);
}
+void BM_mesh_select_mode_flush(BMesh *bm)
+{
+ BM_mesh_select_mode_flush_ex(bm, bm->selectmode);
+}
+
/**
* mode independent flushing up/down
*/
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_marking.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_marking.h 2012-07-20 06:34:31 UTC (rev 49073)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_marking.h 2012-07-20 09:49:54 UTC (rev 49074)
@@ -60,6 +60,7 @@
void BM_face_select_set(BMesh *bm, BMFace *f, int select);
void BM_mesh_select_mode_set(BMesh *bm, int selectmode);
+void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode);
void BM_mesh_select_mode_flush(BMesh *bm);
void BM_mesh_deselect_flush(BMesh *bm);
Modified: trunk/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mesh.h 2012-07-20 06:34:31 UTC (rev 49073)
+++ trunk/blender/source/blender/editors/include/ED_mesh.h 2012-07-20 09:49:54 UTC (rev 49074)
@@ -104,14 +104,14 @@
void EDBM_select_more(struct BMEditMesh *em);
void EDBM_select_less(struct BMEditMesh *em);
-void EDBM_selectmode_flush_ex(struct BMEditMesh *em, int selectmode);
+void EDBM_selectmode_flush_ex(struct BMEditMesh *em, const short selectmode);
void EDBM_selectmode_flush(struct BMEditMesh *em);
void EDBM_deselect_flush(struct BMEditMesh *em);
void EDBM_select_flush(struct BMEditMesh *em);
void EDBM_selectmode_set(struct BMEditMesh *em);
-void EDBM_selectmode_convert(struct BMEditMesh *em, short oldmode, short selectmode);
+void EDBM_selectmode_convert(struct BMEditMesh *em, short oldmode, const short selectmode);
void undo_push_mesh(struct bContext *C, const char *name);
int EDBM_vert_color_check(struct BMEditMesh *em);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-07-20 06:34:31 UTC (rev 49073)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-07-20 09:49:54 UTC (rev 49074)
@@ -1682,15 +1682,15 @@
}
}
-void EDBM_selectmode_convert(BMEditMesh *em, short oldmode, short selectmode)
+void EDBM_selectmode_convert(BMEditMesh *em, const short selectmode_old, const short selectmode_new)
{
BMEdge *eed;
BMFace *efa;
BMIter iter;
/* have to find out what the selectionmode was previously */
- if (oldmode == SCE_SELECT_VERTEX) {
- if (selectmode == SCE_SELECT_EDGE) {
+ if (selectmode_old == SCE_SELECT_VERTEX) {
+ if (selectmode_new == SCE_SELECT_EDGE) {
/* select all edges associated with every selected vertex */
eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL);
for (; eed; eed = BM_iter_step(&iter)) {
@@ -1701,7 +1701,7 @@
}
}
}
- else if (selectmode == SCE_SELECT_FACE) {
+ else if (selectmode_new == SCE_SELECT_FACE) {
BMIter liter;
BMLoop *l;
@@ -1718,9 +1718,8 @@
}
}
}
-
- if (oldmode == SCE_SELECT_EDGE) {
- if (selectmode == SCE_SELECT_FACE) {
+ else if (selectmode_old == SCE_SELECT_EDGE) {
+ if (selectmode_new == SCE_SELECT_FACE) {
BMIter liter;
BMLoop *l;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_utils.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2012-07-20 06:34:31 UTC (rev 49073)
+++ trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2012-07-20 09:49:54 UTC (rev 49074)
@@ -452,11 +452,9 @@
return (tm->face_index && index < tm->bm->totface && index >= 0) ? tm->face_index[index] : NULL;
}
-void EDBM_selectmode_flush_ex(BMEditMesh *em, int selectmode)
+void EDBM_selectmode_flush_ex(BMEditMesh *em, const short selectmode)
{
- em->bm->selectmode = selectmode;
- BM_mesh_select_mode_flush(em->bm);
- em->bm->selectmode = em->selectmode;
+ BM_mesh_select_mode_flush_ex(em->bm, selectmode);
}
void EDBM_selectmode_flush(BMEditMesh *em)
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2012-07-20 06:34:31 UTC (rev 49073)
+++ trunk/blender/source/blender/editors/transform/transform.c 2012-07-20 09:49:54 UTC (rev 49074)
@@ -170,12 +170,12 @@
if (t->options & CTX_MASK) {
/* clamp w/h, mask only */
if (mulx / divx < muly / divy) {
- divx = divy = divx;
- mulx = muly = mulx;
+ divy = divx;
+ muly = mulx;
}
else {
- divx = divy = divy;
- mulx = muly = muly;
+ divx = divy;
+ mulx = muly;
}
}
More information about the Bf-blender-cvs
mailing list