archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-08-22 15:27:03 +10:00
parent d9de8c469b 53527ac10f
commit cb410429cc
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/include/ED_mesh.h
View File

@@ -208,7 +208,7 @@ void ED_operatormacros_mesh(void);
void ED_keymap_mesh(struct wmKeyConfig *keyconf); void ED_keymap_mesh(struct wmKeyConfig *keyconf);
/* editmesh_tools.c (could be moved) */ /* 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 */ /* editface.c */

4
source/blender/editors/mesh/editmesh_extrude.c
View 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 */ /* also project the source, for retopo workflow */
if (use_proj) { 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) { 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 /* This normally happens when pushing undo but modal operators

2
source/blender/editors/mesh/editmesh_tools.c
View 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); 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); Main *bmain = CTX_data_main(C);
Object *obedit = em->ob; Object *obedit = em->ob;