diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-01-02 22:10:35 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-01-02 22:10:35 +0300 |
| commit | a6721c60d9bc0897e3ce0dc87264fbc705284397 (patch) | |
| tree | 12dd77160bcfaa4b37e85a5e8ed29496bb6c0705 /source/blender/editors/mesh/mesh_intern.h | |
| parent | 16ca4b572e07aa0f83158c187a7c64b27675d4c9 (diff) | |
2.5
From the anti-globalization department:
G.obedit terminated!
Wherever possible, use CTX_data_edit_object(C) to get this
now. It's stored in scene now, and the screen context has
it defined.
Diffstat (limited to 'source/blender/editors/mesh/mesh_intern.h')
| -rw-r--r-- | source/blender/editors/mesh/mesh_intern.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index a23e3e42012..8000d227885 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -35,8 +35,6 @@ struct bContext; struct wmOperatorType; -#define TEST_EDITMESH if(G.obedit==0) return; /* layer test XXX */ - #define UVCOPY(t, s) memcpy(t, s, 2 * sizeof(float)); /* ******************** editface.c */ @@ -136,8 +134,8 @@ void recalc_editnormals(EditMesh *em); extern short extrudeflag_face_indiv(EditMesh *em, short flag, float *nor); extern short extrudeflag_verts_indiv(EditMesh *em, short flag, float *nor); extern short extrudeflag_edges_indiv(EditMesh *em, short flag, float *nor); -extern short extrudeflag_vert(EditMesh *em, short flag, float *nor); -extern short extrudeflag(EditMesh *em, short flag, float *nor); +extern short extrudeflag_vert(Object *obedit, EditMesh *em, short flag, float *nor); +extern short extrudeflag(Object *obedit, EditMesh *em, short flag, float *nor); extern void adduplicateflag(EditMesh *em, int flag); extern void delfaceflag(EditMesh *em, int flag); @@ -193,7 +191,7 @@ extern EditVert *findnearestvert(ViewContext *vc, int *dist, short sel, short st void join_triangles(EditMesh *em); int removedoublesflag(EditMesh *em, short flag, short automerge, float limit); /* return amount */ -void esubdivideflag(EditMesh *em, int flag, float rad, int beauty, int numcuts, int seltype); +void esubdivideflag(Object *obedit, EditMesh *em, int flag, float rad, int beauty, int numcuts, int seltype); int EdgeSlide(EditMesh *em, short immediate, float imperc); |