[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48458] trunk/blender/source/blender: fix for own error renaming bmesh operator dupe

Campbell Barton ideasman42 at gmail.com
Sat Jun 30 23:19:22 CEST 2012


Revision: 48458
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48458
Author:   campbellbarton
Date:     2012-06-30 21:19:12 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
fix  for own error renaming bmesh operator dupe

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
    trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
    trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c
    trunk/blender/source/blender/modifiers/intern/MOD_array.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dupe.c	2012-06-30 19:48:51 UTC (rev 48457)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dupe.c	2012-06-30 21:19:12 UTC (rev 48458)
@@ -487,7 +487,7 @@
 	BMO_slot_copy(op, op, "geom", "lastout");
 	for (a = 0; a < steps; a++) {
 		if (do_dupli) {
-			BMO_op_initf(bm, &dupop, "dupe geom=%s", op, "lastout");
+			BMO_op_initf(bm, &dupop, "duplicate geom=%s", op, "lastout");
 			BMO_op_exec(bm, &dupop);
 			BMO_op_callf(bm, "rotate cent=%v mat=%m3 verts=%s",
 			             cent, rmat, &dupop, "newout");

Modified: trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_extrude.c	2012-06-30 19:48:51 UTC (rev 48457)
+++ trunk/blender/source/blender/bmesh/operators/bmo_extrude.c	2012-06-30 21:19:12 UTC (rev 48458)
@@ -195,7 +195,7 @@
 		BMO_elem_flag_enable(bm, e->v2, EXT_INPUT);
 	}
 
-	BMO_op_initf(bm, &dupeop, "dupe geom=%fve", EXT_INPUT);
+	BMO_op_initf(bm, &dupeop, "duplicate geom=%fve", EXT_INPUT);
 	BMO_op_exec(bm, &dupeop);
 
 	/* disable root flag on all new skin nodes */

Modified: trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_mirror.c	2012-06-30 19:48:51 UTC (rev 48457)
+++ trunk/blender/source/blender/bmesh/operators/bmo_mirror.c	2012-06-30 21:19:12 UTC (rev 48458)
@@ -62,7 +62,7 @@
 	BMO_slot_mat4_get(op, "mat", mtx);
 	invert_m4_m4(imtx, mtx);
 	
-	BMO_op_initf(bm, &dupeop, "dupe geom=%s", op, "geom");
+	BMO_op_initf(bm, &dupeop, "duplicate geom=%s", op, "geom");
 	BMO_op_exec(bm, &dupeop);
 	
 	BMO_slot_buffer_flag_enable(bm, &dupeop, "newout", BM_ALL, ELE_NEW);

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-06-30 19:48:51 UTC (rev 48457)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-06-30 21:19:12 UTC (rev 48458)
@@ -1271,7 +1271,7 @@
 	BMEditMesh *em = BMEdit_FromObject(ob);
 	BMOperator bmop;
 
-	EDBM_op_init(em, &bmop, op, "dupe geom=%hvef", BM_ELEM_SELECT);
+	EDBM_op_init(em, &bmop, op, "duplicate geom=%hvef", BM_ELEM_SELECT);
 	
 	BMO_op_exec(em->bm, &bmop);
 	EDBM_flag_disable_all(em, BM_ELEM_SELECT);
@@ -2819,7 +2819,7 @@
 
 	ED_base_object_select(basenew, BA_DESELECT);
 	
-	EDBM_op_callf(em, wmop, "dupe geom=%hvef dest=%p", BM_ELEM_SELECT, bm_new);
+	EDBM_op_callf(em, wmop, "duplicate geom=%hvef dest=%p", BM_ELEM_SELECT, bm_new);
 	EDBM_op_callf(em, wmop, "delete geom=%hvef context=%i", BM_ELEM_SELECT, DEL_FACES);
 
 	/* clean up any loose edges */

Modified: trunk/blender/source/blender/modifiers/intern/MOD_array.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_array.c	2012-06-30 19:48:51 UTC (rev 48457)
+++ trunk/blender/source/blender/modifiers/intern/MOD_array.c	2012-06-30 21:19:12 UTC (rev 48458)
@@ -412,7 +412,7 @@
 	if (amd->flags & MOD_ARR_MERGE)
 		BMO_op_init(em->bm, &weld_op, "weld_verts");
 
-	BMO_op_initf(em->bm, &dupe_op, "dupe geom=%avef");
+	BMO_op_initf(em->bm, &dupe_op, "duplicate geom=%avef");
 	first_dupe_op = dupe_op;
 
 	for (j = 0; j < count - 1; j++) {
@@ -422,7 +422,7 @@
 		BMOIter oiter;
 
 		if (j != 0)
-			BMO_op_initf(em->bm, &dupe_op, "dupe geom=%s", &old_dupe_op, "newout");
+			BMO_op_initf(em->bm, &dupe_op, "duplicate geom=%s", &old_dupe_op, "newout");
 		BMO_op_exec(em->bm, &dupe_op);
 
 		geom_slot = BMO_slot_get(&dupe_op, "geom");




More information about the Bf-blender-cvs mailing list