code cleanup: make bmesh operator names more consistant since python has access to...
[blender.git] / source / blender / bmesh / operators / bmo_dupe.c
index 5391341214b383565bf4b2f68766ff1bab4236d5..f32ba4430b8bd6fff9d0467a1b5edc32e5fafaec 100644 (file)
@@ -102,7 +102,7 @@ static BMEdge *copy_edge(BMOperator *op, BMesh *source_mesh,
        if (rlen < 2) {
                /* not sure what non-manifold cases of greater then three
                 * radial should do. */
-               BMO_slot_map_ptr_insert(op, op->slots_out, "boundarymap_out",
+               BMO_slot_map_ptr_insert(op, op->slots_out, "boundarymap.out",
                                        source_edge, target_edge);
        }
 
@@ -154,8 +154,8 @@ static BMFace *copy_face(BMOperator *op, BMesh *source_mesh,
        
        /* create new face */
        target_face = BM_face_create(target_mesh, vtar, edar, source_face->len, FALSE);
-       BMO_slot_map_ptr_insert(op, op->slots_out, "facemap_out", source_face, target_face);
-       BMO_slot_map_ptr_insert(op, op->slots_out, "facemap_out", target_face, source_face);
+       BMO_slot_map_ptr_insert(op, op->slots_out, "facemap.out", source_face, target_face);
+       BMO_slot_map_ptr_insert(op, op->slots_out, "facemap.out", target_face, source_face);
 
        BM_elem_attrs_copy(source_mesh, target_mesh, source_face, target_face);
 
@@ -227,7 +227,7 @@ static void bmo_mesh_copy(BMOperator *op, BMesh *source, BMesh *target)
                        }
 
                        if (isolated) {
-                               BMO_slot_map_ptr_insert(op, op->slots_out, "isovertmap_out", v, v2);
+                               BMO_slot_map_ptr_insert(op, op->slots_out, "isovertmap.out", v, v2);
                        }
 
                        BMO_elem_flag_enable(source, v, DUPE_DONE);
@@ -331,10 +331,10 @@ void bmo_duplicate_exec(BMesh *bm, BMOperator *op)
        /* Output */
        /* First copy the input buffers to output buffers - original data */
        BMO_slot_copy(dupeop, slots_in,  "geom",
-                     dupeop, slots_out, "origout");
+                     dupeop, slots_out, "geom_orig.out");
 
        /* Now alloc the new output buffers */
-       BMO_slot_buffer_from_enabled_flag(bm, dupeop, dupeop->slots_out, "newout", BM_ALL, DUPE_NEW);
+       BMO_slot_buffer_from_enabled_flag(bm, dupeop, dupeop->slots_out, "geom.out", BM_ALL, DUPE_NEW);
 }
 
 #if 0 /* UNUSED */
@@ -435,14 +435,14 @@ void bmo_split_exec(BMesh *bm, BMOperator *op)
        BMO_op_exec(bm, &delop);
 
        /* now we make our outputs by copying the dupe output */
-       BMO_slot_copy(&dupeop, slots_out, "newout",
-                     splitop, slots_out, "geomout");
+       BMO_slot_copy(&dupeop, slots_out, "geom.out",
+                     splitop, slots_out, "geom.out");
 
-       BMO_slot_copy(&dupeop, slots_out, "boundarymap_out",
-                     splitop, slots_out, "boundarymap_out");
+       BMO_slot_copy(&dupeop, slots_out, "boundarymap.out",
+                     splitop, slots_out, "boundarymap.out");
 
-       BMO_slot_copy(&dupeop, slots_out, "isovertmap_out",
-                     splitop, slots_out, "isovertmap_out");
+       BMO_slot_copy(&dupeop, slots_out, "isovertmap.out",
+                     splitop, slots_out, "isovertmap.out");
 
 
        /* cleanup */
@@ -487,33 +487,33 @@ void bmo_spin_exec(BMesh *bm, BMOperator *op)
        BMO_slot_vec_get(op->slots_in, "dvec", dvec);
        usedvec = !is_zero_v3(dvec);
        steps    = BMO_slot_int_get(op->slots_in,   "steps");
-       phi      = BMO_slot_float_get(op->slots_in, "ang") * DEG2RADF(1.0f) / steps;
-       do_dupli = BMO_slot_bool_get(op->slots_in,  "do_dupli");
+       phi      = BMO_slot_float_get(op->slots_in, "angle") * DEG2RADF(1.0f) / steps;
+       do_dupli = BMO_slot_bool_get(op->slots_in,  "use_duplicate");
 
        axis_angle_to_mat3(rmat, axis, phi);
 
        BMO_slot_copy(op, slots_in,  "geom",
-                     op, slots_out, "lastout");
+                     op, slots_out, "geom_last.out");
        for (a = 0; a < steps; a++) {
                if (do_dupli) {
-                       BMO_op_initf(bm, &dupop, op->flag, "duplicate geom=%S", op, "lastout");
+                       BMO_op_initf(bm, &dupop, op->flag, "duplicate geom=%S", op, "geom_last.out");
                        BMO_op_exec(bm, &dupop);
                        BMO_op_callf(bm, op->flag,
                                     "rotate cent=%v mat=%m3 verts=%S",
-                                    cent, rmat, &dupop, "newout");
-                       BMO_slot_copy(&dupop, slots_out, "newout",
-                                     op,     slots_out, "lastout");
+                                    cent, rmat, &dupop, "geom.out");
+                       BMO_slot_copy(&dupop, slots_out, "geom.out",
+                                     op,     slots_out, "geom_last.out");
                        BMO_op_finish(bm, &dupop);
                }
                else {
-                       BMO_op_initf(bm, &extop, op->flag, "extrude_face_region edgefacein=%S",
-                                    op, "lastout");
+                       BMO_op_initf(bm, &extop, op->flag, "extrude_face_region geom=%S",
+                                    op, "geom_last.out");
                        BMO_op_exec(bm, &extop);
                        BMO_op_callf(bm, op->flag,
                                     "rotate cent=%v mat=%m3 verts=%S",
-                                    cent, rmat, &extop, "geomout");
-                       BMO_slot_copy(&extop, slots_out, "geomout",
-                                     op,     slots_out, "lastout");
+                                    cent, rmat, &extop, "geom.out");
+                       BMO_slot_copy(&extop, slots_out, "geom.out",
+                                     op,     slots_out, "geom_last.out");
                        BMO_op_finish(bm, &extop);
                }
 
@@ -521,7 +521,7 @@ void bmo_spin_exec(BMesh *bm, BMOperator *op)
                        mul_m3_v3(rmat, dvec);
                        BMO_op_callf(bm, op->flag,
                                     "translate vec=%v verts=%S",
-                                    dvec, op, "lastout");
+                                    dvec, op, "geom_last.out");
                }
        }
 }