Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 22 Aug 2018 05:27:03 +0000 (15:27 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 22 Aug 2018 05:27:03 +0000 (15:27 +1000)
source/blender/editors/include/ED_mesh.h
source/blender/editors/mesh/editmesh_extrude.c
source/blender/editors/mesh/editmesh_tools.c

index a9ef7d9283ffb0435adfdc5c5ce925383406be48..0a884e7909ba365721f3dec559976b279e06d6c0 100644 (file)
@@ -208,7 +208,7 @@ void        ED_operatormacros_mesh(void);
 void        ED_keymap_mesh(struct wmKeyConfig *keyconf);
 
 /* editmesh_tools.c (could be moved) */
-void EMBM_project_snap_verts(struct bContext *C, struct ARegion *ar, struct BMEditMesh *em);
+void EDBM_project_snap_verts(struct bContext *C, struct ARegion *ar, struct BMEditMesh *em);
 
 
 /* editface.c */
index c2a8ad7c3fecd47e007060b88d5fabb5f9d02e1e..6e87f20cf8c5051b62722be018f45a27a4580759 100644 (file)
@@ -1137,7 +1137,7 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
 
                                /* also project the source, for retopo workflow */
                                if (use_proj) {
-                                       EMBM_project_snap_verts(C, vc.ar, vc.em);
+                                       EDBM_project_snap_verts(C, vc.ar, vc.em);
                                }
                        }
 
@@ -1171,7 +1171,7 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
                }
 
                if (use_proj) {
-                       EMBM_project_snap_verts(C, vc.ar, vc.em);
+                       EDBM_project_snap_verts(C, vc.ar, vc.em);
                }
 
                /* This normally happens when pushing undo but modal operators
index cb008c376c3a591cc9a8cf36fe0d7b242f133022..4fe2351ef7d59154dea7bd2364975e50b45e5590 100644 (file)
@@ -363,7 +363,7 @@ void MESH_OT_unsubdivide(wmOperatorType *ot)
        RNA_def_int(ot->srna, "iterations", 2, 1, 1000, "Iterations", "Number of times to unsubdivide", 1, 100);
 }
 
-void EMBM_project_snap_verts(bContext *C, ARegion *ar, BMEditMesh *em)
+void EDBM_project_snap_verts(bContext *C, ARegion *ar, BMEditMesh *em)
 {
        Main *bmain = CTX_data_main(C);
        Object *obedit = em->ob;