Revision: 51329
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51329
Author: campbellbarton
Date: 2012-10-15 03:27:05 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
code cleanup: remove redundant pointer indirection.
Modified Paths:
--------------
trunk/blender/source/blender/editors/mesh/editmesh_rip.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
Modified: trunk/blender/source/blender/editors/mesh/editmesh_rip.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_rip.c 2012-10-15
03:17:10 UTC (rev 51328)
+++ trunk/blender/source/blender/editors/mesh/editmesh_rip.c 2012-10-15
03:27:05 UTC (rev 51329)
@@ -387,6 +387,11 @@
/**
* return an un-ordered array of loop pairs
* use for rebuilding face-fill
+ *
+ * \note the method currenly used fails for edges with 3+ face users and gives
+ * nasty holes in the mesh, there isnt a good way of knowing ahead of
time
+ * which loops will be split apart (its possible to figure out but quite
involved).
+ * So for now this is a known limitation of current rip-fill option.
*/
typedef struct UnorderedLoopPair {
@@ -562,7 +567,7 @@
ED_view3d_ob_project_mat_get(rv3d, obedit, projectMat);
/* find selected vert - same some time and check history first */
- if (BM_select_history_active_get(em->bm, &ese) && ese.htype == BM_VERT)
{
+ if (BM_select_history_active_get(bm, &ese) && ese.htype == BM_VERT) {
v = (BMVert *)ese.ele;
}
else {
@@ -669,7 +674,7 @@
int vi_best = 0;
if (ese.ele) {
- BM_select_history_remove(em->bm, ese.ele);
+ BM_select_history_remove(bm, ese.ele);
}
dist = FLT_MAX;
@@ -717,7 +722,7 @@
BM_vert_select_set(bm, v, TRUE);
if (ese.ele) {
- BM_select_history_store(em->bm, v);
+ BM_select_history_store(bm, v);
}
/* splice all others back together */
@@ -806,7 +811,7 @@
float scale;
dist = FLT_MAX;
- BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
+ BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
/* disable by default, re-enable winner at end
*/
BM_vert_select_set(bm, v, FALSE);
@@ -836,7 +841,7 @@
if (v_best) {
BM_vert_select_set(bm, v_best, TRUE);
if (ese.ele) {
- BM_select_history_store(em->bm, v_best);
+ BM_select_history_store(bm, v_best);
}
}
}
@@ -997,7 +1002,7 @@
int ret;
/* running in face mode hardly makes sense, so convert to region loop
and rip */
- if (em->bm->totfacesel) {
+ if (bm->totfacesel) {
/* highly nifty but hard to support since the operator can fail
and we're left
* with modified selection */
// WM_operator_name_call(C, "MESH_OT_region_to_loop",
WM_OP_INVOKE_DEFAULT, NULL);
@@ -1017,7 +1022,7 @@
*/
/* BM_ELEM_SELECT --> BM_ELEM_TAG */
- BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
+ BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
BM_elem_flag_set(e, BM_ELEM_TAG, BM_elem_flag_test(e,
BM_ELEM_SELECT));
}
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2012-10-15
03:17:10 UTC (rev 51328)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2012-10-15
03:27:05 UTC (rev 51329)
@@ -2492,13 +2492,16 @@
break;
if (efa_index != vlist_iter->f)
{
+ BMLoop *l_other;
efa_vlist =
EDBM_face_at_index(em, vlist_iter->f);
/* tf_vlist =
CustomData_bmesh_get(&em->bm->pdata, efa_vlist->head.data, CD_MTEXPOLY); */ /*
UNUSED */
+ l_other =
BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, efa_vlist, vlist_iter->tfindex);
+
if (select)
-
uvedit_uv_select_enable(em, scene, BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE,
efa_vlist, vlist_iter->tfindex), FALSE);
+
uvedit_uv_select_enable(em, scene, l_other, FALSE);
else
-
uvedit_uv_select_disable(em, scene, BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE,
efa_vlist, vlist_iter->tfindex));
+
uvedit_uv_select_disable(em, scene, l_other);
}
vlist_iter = vlist_iter->next;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
