[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51309] trunk/blender: forgot to add to menu in previous commit, also remove odd _rip_rip_ name of some static functions in rip code.

Campbell Barton ideasman42 at gmail.com
Sun Oct 14 06:50:51 CEST 2012


Revision: 51309
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51309
Author:   campbellbarton
Date:     2012-10-14 04:50:43 +0000 (Sun, 14 Oct 2012)
Log Message:
-----------
forgot to add to menu in previous commit, also remove odd _rip_rip_ name of some static functions in rip code.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
    trunk/blender/source/blender/editors/mesh/editmesh_rip.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2012-10-14 04:42:11 UTC (rev 51308)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2012-10-14 04:50:43 UTC (rev 51309)
@@ -1778,6 +1778,7 @@
 
         layout.operator("mesh.merge")
         layout.operator("mesh.rip_move")
+        layout.operator("mesh.rip_move_fill")
         layout.operator("mesh.split")
         layout.operator_menu_enum("mesh.separate", "type")
         layout.operator("mesh.vert_connect")

Modified: trunk/blender/source/blender/editors/mesh/editmesh_rip.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_rip.c	2012-10-14 04:42:11 UTC (rev 51308)
+++ trunk/blender/source/blender/editors/mesh/editmesh_rip.c	2012-10-14 04:50:43 UTC (rev 51309)
@@ -63,9 +63,9 @@
  * point and would result in teh same distance.
  */
 #define INSET_DEFAULT 0.00001f
-static float edbm_rip_rip_edgedist(ARegion *ar, float mat[][4],
-                                   const float co1[3], const float co2[3], const float mvalf[2],
-                                   const float inset)
+static float edbm_rip_edgedist(ARegion *ar, float mat[][4],
+                               const float co1[3], const float co2[3], const float mvalf[2],
+                               const float inset)
 {
 	float vec1[2], vec2[2];
 
@@ -83,8 +83,8 @@
 }
 
 #if 0
-static float edbm_rip_rip_linedist(ARegion *ar, float mat[][4],
-                                   const float co1[3], const float co2[3], const float mvalf[2])
+static float edbm_rip_linedist(ARegion *ar, float mat[][4],
+                               const float co1[3], const float co2[3], const float mvalf[2])
 {
 	float vec1[2], vec2[2];
 
@@ -591,7 +591,7 @@
 			totboundary_edge += (is_boundary != 0 || BM_edge_is_wire(e));
 			if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN)) {
 				if (is_boundary == FALSE && BM_edge_is_manifold(e)) {
-					d = edbm_rip_rip_edgedist(ar, projectMat, e->v1->co, e->v2->co, fmval, INSET_DEFAULT);
+					d = edbm_rip_edgedist(ar, projectMat, e->v1->co, e->v2->co, fmval, INSET_DEFAULT);
 					if (d < dist) {
 						dist = d;
 						e2 = e;
@@ -619,7 +619,7 @@
 				float l_mid_co[3];
 				l = l_all[i1];
 				edbm_calc_loop_co(l, l_mid_co);
-				d = edbm_rip_rip_edgedist(ar, projectMat, l->v->co, l_mid_co, fmval, INSET_DEFAULT);
+				d = edbm_rip_edgedist(ar, projectMat, l->v->co, l_mid_co, fmval, INSET_DEFAULT);
 
 				if (d < dist) {
 					dist = d;
@@ -685,7 +685,7 @@
 							float l_mid_co[3];
 							edbm_calc_loop_co(l, l_mid_co);
 
-							d = edbm_rip_rip_edgedist(ar, projectMat, v->co, l_mid_co, fmval, INSET_DEFAULT);
+							d = edbm_rip_edgedist(ar, projectMat, v->co, l_mid_co, fmval, INSET_DEFAULT);
 
 							if (d < dist) {
 								dist = d;
@@ -701,7 +701,7 @@
 							float e_mid_co[3];
 							mid_v3_v3v3(e_mid_co, e->v1->co, e->v2->co);
 
-							d = edbm_rip_rip_edgedist(ar, projectMat, v->co, e_mid_co, fmval, INSET_DEFAULT);
+							d = edbm_rip_edgedist(ar, projectMat, v->co, e_mid_co, fmval, INSET_DEFAULT);
 
 							if (d < dist) {
 								dist = d;
@@ -824,7 +824,7 @@
 					add_v3_v3v3(l_corner_co, l_prev_co, l_next_co);
 					add_v3_v3(l_corner_co, l->v->co);
 
-					d = edbm_rip_rip_edgedist(ar, projectMat, l->v->co, l_corner_co, fmval, INSET_DEFAULT);
+					d = edbm_rip_edgedist(ar, projectMat, l->v->co, l_corner_co, fmval, INSET_DEFAULT);
 					if (d < dist) {
 						v_best = v;
 						dist = d;




More information about the Bf-blender-cvs mailing list