Merge branch 'master' into blender2.8

2018-08-22 15:27:03 +10:00
parent d9de8c469b 53527ac10f
commit cb410429cc
3 changed files with 4 additions and 4 deletions
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -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;