as per discussion with ton, the editmesh accessors now live
in blenkernel.
This commit is contained in:
parent
fc02e980f4
commit
59578bfad2
@ -36,6 +36,7 @@
|
||||
struct BoundBox;
|
||||
struct DispList;
|
||||
struct ListBase;
|
||||
struct EditMesh;
|
||||
struct MDeformVert;
|
||||
struct Mesh;
|
||||
struct MFace;
|
||||
@ -51,6 +52,9 @@ struct CustomData;
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
struct EditMesh *BKE_mesh_get_editmesh(struct Mesh *me);
|
||||
void BKE_mesh_end_editmesh(struct Mesh *me, struct EditMesh *em);
|
||||
|
||||
void unlink_mesh(struct Mesh *me);
|
||||
void free_mesh(struct Mesh *me);
|
||||
struct Mesh *add_mesh(char *name);
|
||||
|
@ -457,11 +457,11 @@ static void vertex_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, fl
|
||||
/* simple preventing of too deep nested groups */
|
||||
if(level>MAX_DUPLI_RECUR) return;
|
||||
|
||||
em = EM_GetEditMesh(me);
|
||||
em = BKE_mesh_get_editmesh(me);
|
||||
|
||||
if(em) {
|
||||
dm= editmesh_get_derived_cage(scene, par, em, CD_MASK_BAREMESH);
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
} else
|
||||
dm= mesh_get_derived_deform(scene, par, CD_MASK_BAREMESH);
|
||||
|
||||
@ -572,7 +572,7 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa
|
||||
|
||||
Mat4CpyMat4(pmat, par->obmat);
|
||||
|
||||
em = EM_GetEditMesh(me);
|
||||
em = BKE_mesh_get_editmesh(me);
|
||||
if(em) {
|
||||
int totvert;
|
||||
|
||||
@ -585,7 +585,7 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa
|
||||
mvert= MEM_mallocN(sizeof(MVert)*totvert, "mvert temp");
|
||||
dm->copyVertArray(dm, mvert);
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
else {
|
||||
dm = mesh_get_derived_deform(scene, par, CD_MASK_BAREMESH);
|
||||
|
@ -392,7 +392,7 @@ static void contarget_get_mesh_mat (Object *ob, char *substring, float mat[][4])
|
||||
{
|
||||
DerivedMesh *dm;
|
||||
Mesh *me= ob->data;
|
||||
EditMesh *em = EM_GetEditMesh(me);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(me);
|
||||
float vec[3] = {0.0f, 0.0f, 0.0f}, tvec[3];
|
||||
float normal[3] = {0.0f, 0.0f, 0.0f}, plane[3];
|
||||
float imat[3][3], tmat[3][3];
|
||||
@ -480,7 +480,7 @@ static void contarget_get_mesh_mat (Object *ob, char *substring, float mat[][4])
|
||||
/* free temporary DerivedMesh created (in EditMode case) */
|
||||
if (em) {
|
||||
if (dm) dm->release(dm);
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2388,7 +2388,7 @@ void write_stl(Scene *scene, char *str)
|
||||
static void write_videoscape_mesh(Scene *scene, Object *ob, char *str)
|
||||
{
|
||||
Mesh *me= ob->data;
|
||||
EditMesh *em = EM_GetEditMesh(me);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(me);
|
||||
Material *ma;
|
||||
MFace *mface;
|
||||
FILE *fp;
|
||||
@ -2490,7 +2490,7 @@ static void write_videoscape_mesh(Scene *scene, Object *ob, char *str)
|
||||
|
||||
fclose(fp);
|
||||
|
||||
if (em) EM_EndEditMesh(em);
|
||||
if (em) BKE_mesh_end_editmesh(me, em);
|
||||
|
||||
}
|
||||
|
||||
|
@ -71,6 +71,17 @@
|
||||
#include "BLI_editVert.h"
|
||||
#include "BLI_arithb.h"
|
||||
|
||||
|
||||
EditMesh *BKE_mesh_get_editmesh(Mesh *me)
|
||||
{
|
||||
return me->edit_mesh;
|
||||
}
|
||||
|
||||
void BKE_mesh_end_editmesh(Mesh *me, EditMesh *em)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
void mesh_update_customdata_pointers(Mesh *me)
|
||||
{
|
||||
me->mvert = CustomData_get_layer(&me->vdata, CD_MVERT);
|
||||
|
@ -7541,7 +7541,7 @@ static void meshdeformModifier_do(
|
||||
DerivedMesh *tmpdm, *cagedm;
|
||||
MDeformVert *dvert = NULL;
|
||||
MDeformWeight *dw;
|
||||
EditMesh *em = EM_GetEditMesh(me);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(me);
|
||||
MVert *cagemvert;
|
||||
float imat[4][4], cagemat[4][4], iobmat[4][4], icagemat[3][3], cmat[4][4];
|
||||
float weight, totweight, fac, co[3], *weights, (*dco)[3], (*bindcos)[3];
|
||||
@ -7555,7 +7555,7 @@ static void meshdeformModifier_do(
|
||||
tmpdm= editmesh_get_derived_cage_and_final(md->scene, ob, em, &cagedm, 0);
|
||||
if(tmpdm)
|
||||
tmpdm->release(tmpdm);
|
||||
EM_EndEditMesh(em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
else
|
||||
cagedm= mmd->object->derivedFinal;
|
||||
|
@ -1642,7 +1642,7 @@ static void give_parvert(Object *par, int nr, float *vec)
|
||||
|
||||
if(par->type==OB_MESH) {
|
||||
Mesh *me= par->data;
|
||||
em = EM_GetEditMesh(me);
|
||||
em = BKE_mesh_get_editmesh(me);
|
||||
|
||||
if(em) {
|
||||
EditVert *eve;
|
||||
@ -1653,7 +1653,7 @@ static void give_parvert(Object *par, int nr, float *vec)
|
||||
break;
|
||||
}
|
||||
}
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
else {
|
||||
DerivedMesh *dm = par->derivedFinal;
|
||||
@ -2296,12 +2296,12 @@ void object_handle_update(Scene *scene, Object *ob)
|
||||
|
||||
/* includes all keys and modifiers */
|
||||
if(ob->type==OB_MESH) {
|
||||
EditMesh *em = EM_GetEditMesh(ob->data);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(ob->data);
|
||||
|
||||
// here was vieweditdatamask? XXX
|
||||
if(ob==scene->obedit) {
|
||||
makeDerivedMesh(scene, ob, em, CD_MASK_BAREMESH);
|
||||
EM_EndEditMesh(ob->data, em);
|
||||
BKE_mesh_end_editmesh(ob->data, em);
|
||||
} else
|
||||
makeDerivedMesh(scene, ob, NULL, CD_MASK_BAREMESH);
|
||||
}
|
||||
|
@ -96,14 +96,14 @@ typedef void ( *Shrinkwrap_ForeachVertexCallback) (DerivedMesh *target, float *c
|
||||
static DerivedMesh *object_get_derived_final(struct Scene *scene, Object *ob, CustomDataMask dataMask)
|
||||
{
|
||||
Mesh *me= ob->data;
|
||||
EditMesh *em = EM_GetEditMesh(me);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(me);
|
||||
|
||||
if (em)
|
||||
{
|
||||
DerivedMesh *final = NULL;
|
||||
editmesh_get_derived_cage_and_final(scene, ob, em, &final, dataMask);
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return final;
|
||||
}
|
||||
else
|
||||
|
@ -86,8 +86,8 @@ void ED_keymap_mesh(struct wmWindowManager *wm);
|
||||
|
||||
/*accessor functions for editmesh, all access to editmesh must
|
||||
go through them!*/
|
||||
struct EditMesh *EM_GetEditMesh(struct Mesh *me);
|
||||
void EM_EndEditMesh(struct Mesh *me, struct EditMesh *em);
|
||||
struct EditMesh *BKE_mesh_get_editmesh(struct Mesh *me);
|
||||
void BKE_mesh_end_editmesh(struct Mesh *me, struct EditMesh *em);
|
||||
|
||||
void ED_spacetypes_init(void);
|
||||
void ED_keymap_mesh(struct wmWindowManager *wm);
|
||||
|
@ -94,7 +94,7 @@ void sel_verts_defgroup (Object *obedit, int select)
|
||||
case OB_MESH:
|
||||
{
|
||||
Mesh *me= ob->data;
|
||||
EditMesh *em = EM_GetEditMesh(me);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(me);
|
||||
|
||||
for (eve=em->verts.first; eve; eve=eve->next){
|
||||
dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
|
||||
@ -114,7 +114,7 @@ void sel_verts_defgroup (Object *obedit, int select)
|
||||
if(select) EM_select_flush(em); // vertices to edges/faces
|
||||
else EM_deselect_flush(em);
|
||||
|
||||
EM_EndEditMesh(em, me);
|
||||
BKE_mesh_end_editmesh(em, me);
|
||||
}
|
||||
break;
|
||||
case OB_LATTICE:
|
||||
@ -398,7 +398,7 @@ void del_defgroup (Object *ob)
|
||||
/* Make sure that any verts with higher indices are adjusted accordingly */
|
||||
if(ob->type==OB_MESH) {
|
||||
Mesh *me= ob->data;
|
||||
EditMesh *em = EM_GetEditMesh(me);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(me);
|
||||
EditVert *eve;
|
||||
MDeformVert *dvert;
|
||||
|
||||
@ -410,7 +410,7 @@ void del_defgroup (Object *ob)
|
||||
if (dvert->dw[i].def_nr > (ob->actdef-1))
|
||||
dvert->dw[i].def_nr--;
|
||||
}
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
else if(ob->type==OB_LATTICE) {
|
||||
Lattice *lt= def_get_lattice(ob);
|
||||
@ -724,7 +724,7 @@ void assign_verts_defgroup (Object *obedit, float weight)
|
||||
case OB_MESH:
|
||||
{
|
||||
Mesh *me= ob->data;
|
||||
EditMesh *em = EM_GetEditMesh(me);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(me);
|
||||
|
||||
if (!CustomData_has_layer(&em->vdata, CD_MDEFORMVERT))
|
||||
EM_add_data_layer(em, &em->vdata, CD_MDEFORMVERT);
|
||||
@ -764,7 +764,7 @@ void assign_verts_defgroup (Object *obedit, float weight)
|
||||
}
|
||||
}
|
||||
}
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
break;
|
||||
case OB_LATTICE:
|
||||
@ -888,7 +888,7 @@ void remove_verts_defgroup (Object *obedit, int allverts)
|
||||
case OB_MESH:
|
||||
{
|
||||
Mesh *me= ob->data;
|
||||
EditMesh *em = EM_GetEditMesh(me);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(me);
|
||||
|
||||
for (eve=em->verts.first; eve; eve=eve->next){
|
||||
dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
|
||||
@ -918,7 +918,7 @@ void remove_verts_defgroup (Object *obedit, int allverts)
|
||||
}
|
||||
}
|
||||
}
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
break;
|
||||
case OB_LATTICE:
|
||||
|
@ -1455,10 +1455,10 @@ static int mesh_separate_selected(Scene *scene, Base *editbase)
|
||||
|
||||
obedit= editbase->object;
|
||||
me= obedit->data;
|
||||
em= EM_GetEditMesh(me);
|
||||
em= BKE_mesh_get_editmesh(me);
|
||||
if(me->key) {
|
||||
error("Can't separate with vertex keys");
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1470,7 +1470,7 @@ static int mesh_separate_selected(Scene *scene, Base *editbase)
|
||||
EM_stats_update(em);
|
||||
|
||||
if(em->totvertsel==0) {
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1540,7 +1540,7 @@ static int mesh_separate_selected(Scene *scene, Base *editbase)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
DAG_object_flush_update(scene, basenew->object, OB_RECALC_DATA);
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -1549,7 +1549,7 @@ static int mesh_separate_selected(Scene *scene, Base *editbase)
|
||||
static int mesh_separate_material(Scene *scene, Base *editbase)
|
||||
{
|
||||
Mesh *me= editbase->object->data;
|
||||
EditMesh *em= EM_GetEditMesh(me);
|
||||
EditMesh *em= BKE_mesh_get_editmesh(me);
|
||||
unsigned char curr_mat;
|
||||
|
||||
for (curr_mat = 1; curr_mat < editbase->object->totcol; ++curr_mat) {
|
||||
@ -1559,12 +1559,12 @@ static int mesh_separate_material(Scene *scene, Base *editbase)
|
||||
editmesh_select_by_material(em, curr_mat);
|
||||
/* and now separate */
|
||||
if(0==mesh_separate_selected(scene, editbase)) {
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -1576,11 +1576,11 @@ static int mesh_separate_loose(Scene *scene, Base *editbase)
|
||||
int doit= 1;
|
||||
|
||||
me= editbase->object->data;
|
||||
em= EM_GetEditMesh(me);
|
||||
em= BKE_mesh_get_editmesh(me);
|
||||
|
||||
if(me->key) {
|
||||
error("Can't separate with vertex keys");
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1597,7 +1597,7 @@ static int mesh_separate_loose(Scene *scene, Base *editbase)
|
||||
doit= mesh_separate_selected(scene, editbase);
|
||||
}
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -2027,12 +2027,3 @@ void em_setup_viewcontext(bContext *C, ViewContext *vc)
|
||||
vc->em= me->edit_mesh;
|
||||
}
|
||||
}
|
||||
|
||||
EditMesh *EM_GetEditMesh(Mesh *me)
|
||||
{
|
||||
return me->edit_mesh;
|
||||
}
|
||||
|
||||
void EM_EndEditMesh(Mesh *me, EditMesh *em)
|
||||
{
|
||||
}
|
||||
|
@ -339,18 +339,18 @@ int make_fgon(EditMesh *em, wmOperator *op, int make)
|
||||
static int make_fgon_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
if( make_fgon(em, op, 1) ) {
|
||||
DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -371,18 +371,18 @@ void MESH_OT_fgon_make(struct wmOperatorType *ot)
|
||||
static int clear_fgon_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
if( make_fgon(em, op, 0) ) {
|
||||
DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -785,7 +785,7 @@ static void addedgeface_mesh(EditMesh *em, wmOperator *op)
|
||||
static int addedgeface_mesh_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
addedgeface_mesh(em, op);
|
||||
|
||||
@ -793,7 +793,7 @@ static int addedgeface_mesh_exec(bContext *C, wmOperator *op)
|
||||
|
||||
DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -983,7 +983,7 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
|
||||
* fill - end capping, and option to fill in circle
|
||||
* cent[3] - center of the data.
|
||||
* */
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
EditVert *eve, *v1=NULL, *v2, *v3, *v4=NULL, *vtop, *vdown;
|
||||
float phi, phid, vec[3];
|
||||
float q[4], cmat[3][3], nor[3]= {0.0, 0.0, 0.0};
|
||||
@ -1265,7 +1265,7 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se
|
||||
if(type!=0 && type!=13)
|
||||
righthandfaces(em, 1); /* otherwise monkey has eyes in wrong direction */
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
|
||||
|
||||
|
@ -625,7 +625,7 @@ static float seg_intersect(EditEdge *e, CutCurve *c, int len, char mode, struct
|
||||
static int knife_cut_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
ARegion *ar= CTX_wm_region(C);
|
||||
EditEdge *eed;
|
||||
EditVert *eve;
|
||||
@ -638,7 +638,7 @@ static int knife_cut_exec(bContext *C, wmOperator *op)
|
||||
|
||||
if (EM_nvertices_selected(em) < 2) {
|
||||
error("No edges are selected to operate on");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;;
|
||||
}
|
||||
|
||||
@ -652,7 +652,7 @@ static int knife_cut_exec(bContext *C, wmOperator *op)
|
||||
RNA_END;
|
||||
|
||||
if(len<2) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -702,7 +702,7 @@ static int knife_cut_exec(bContext *C, wmOperator *op)
|
||||
|
||||
BLI_ghash_free(gh, NULL, (GHashValFreeFP)MEM_freeN);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
|
@ -801,7 +801,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Mesh *me= obedit->data;
|
||||
EditMesh *em= EM_GetEditMesh(me);
|
||||
EditMesh *em= BKE_mesh_get_editmesh(me);
|
||||
|
||||
int selcount = similar_face_select__internal(scene, em, RNA_int_get(op->ptr, "type"));
|
||||
|
||||
@ -809,11 +809,11 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
|
||||
/* here was an edge-mode only select flush case, has to be generalized */
|
||||
EM_selectmode_flush(em);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1062,7 +1062,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op)
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Mesh *me= obedit->data;
|
||||
EditMesh *em= EM_GetEditMesh(me);
|
||||
EditMesh *em= BKE_mesh_get_editmesh(me);
|
||||
|
||||
int selcount = similar_edge_select__internal(scene, em, RNA_int_get(op->ptr, "type"));
|
||||
|
||||
@ -1070,11 +1070,11 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op)
|
||||
/* here was an edge-mode only select flush case, has to be generalized */
|
||||
EM_selectmode_flush(em);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1117,7 +1117,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Mesh *me= obedit->data;
|
||||
EditMesh *em= EM_GetEditMesh(me);
|
||||
EditMesh *em= BKE_mesh_get_editmesh(me);
|
||||
EditVert *eve, *base_eve=NULL;
|
||||
unsigned int selcount=0; /* count how many new edges we select*/
|
||||
|
||||
@ -1144,7 +1144,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
|
||||
}
|
||||
|
||||
if (!ok || !deselcount) { /* no data selected OR no more data to select*/
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1175,7 +1175,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
|
||||
selcount++;
|
||||
deselcount--;
|
||||
if (!deselcount) {/*have we selected all posible faces?, if so return*/
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return selcount;
|
||||
}
|
||||
}
|
||||
@ -1193,7 +1193,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
|
||||
selcount++;
|
||||
deselcount--;
|
||||
if (!deselcount) {/*have we selected all posible faces?, if so return*/
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return selcount;
|
||||
}
|
||||
}
|
||||
@ -1207,7 +1207,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
|
||||
CD_MDEFORMVERT);
|
||||
|
||||
if (!base_dvert || base_dvert->totweight == 0) {
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return selcount;
|
||||
}
|
||||
|
||||
@ -1225,7 +1225,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
|
||||
selcount++;
|
||||
deselcount--;
|
||||
if (!deselcount) { /*have we selected all posible faces?, if so return*/
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return selcount;
|
||||
}
|
||||
break;
|
||||
@ -1240,11 +1240,11 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
|
||||
|
||||
if(selcount) {
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1932,7 +1932,7 @@ static void edgering_select(EditMesh *em, EditEdge *startedge, int select)
|
||||
static int loop_multiselect(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
EditEdge *eed;
|
||||
EditEdge **edarray;
|
||||
int edindex, edfirstcount;
|
||||
@ -1971,7 +1971,7 @@ static int loop_multiselect(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -2509,7 +2509,7 @@ void selectconnected_mesh_all(EditMesh *em)
|
||||
static int select_linked_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh(obedit->data);
|
||||
|
||||
if( RNA_boolean_get(op->ptr, "limit") ) {
|
||||
ViewContext vc;
|
||||
@ -2521,7 +2521,7 @@ static int select_linked_exec(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -2650,13 +2650,13 @@ void EM_hide_mesh(EditMesh *em, int swap)
|
||||
static int hide_mesh_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
EM_hide_mesh(em, RNA_boolean_get(op->ptr, "unselected"));
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -2716,13 +2716,13 @@ void EM_reveal_mesh(EditMesh *em)
|
||||
static int reveal_mesh_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
EM_reveal_mesh(em);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -2776,7 +2776,7 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op)
|
||||
* small enough, select the edge
|
||||
*/
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
EditEdge *eed;
|
||||
EditFace *efa;
|
||||
EditFace **efa1;
|
||||
@ -2788,7 +2788,7 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op)
|
||||
|
||||
if(em->selectmode==SCE_SELECT_FACE) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Doesn't work in face selection mode");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -2868,7 +2868,7 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); //TODO is this needed ?
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -3029,13 +3029,13 @@ static void select_linked_flat_faces(EditMesh *em, wmOperator *op, float sharpne
|
||||
static int select_linked_flat_faces_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
select_linked_flat_faces(em, op, RNA_float_get(op->ptr, "sharpness"));
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -3129,13 +3129,13 @@ void select_non_manifold(EditMesh *em, wmOperator *op )
|
||||
static int select_non_manifold_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
select_non_manifold(em, op);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -3192,13 +3192,13 @@ void EM_select_swap(EditMesh *em) /* exported for UV */
|
||||
static int select_invert_mesh_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
EM_select_swap(em);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -3229,12 +3229,12 @@ void EM_toggle_select_all(EditMesh *em) /* exported for UV */
|
||||
static int toggle_select_all_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
EM_toggle_select_all(em);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
@ -3297,7 +3297,7 @@ void EM_select_more(EditMesh *em)
|
||||
static int select_more(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)) ;
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)) ;
|
||||
|
||||
EM_select_more(em);
|
||||
|
||||
@ -3305,7 +3305,7 @@ static int select_more(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -3387,14 +3387,14 @@ void EM_select_less(EditMesh *em)
|
||||
static int select_less(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
EM_select_less(em);
|
||||
|
||||
// if (EM_texFaceCheck(em))
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -3457,13 +3457,13 @@ static void selectrandom_mesh(EditMesh *em, float perc) /* randomly selects a us
|
||||
static int mesh_select_random_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
selectrandom_mesh(em, RNA_float_get(op->ptr,"percent"));
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -3547,13 +3547,13 @@ static int mesh_selection_type_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
mesh_selection_type(CTX_data_scene(C), em, RNA_enum_get(op->ptr,"type"));
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -3581,7 +3581,7 @@ void MESH_OT_selection_type(wmOperatorType *ot)
|
||||
static int editmesh_mark_seam(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
Mesh *me= ((Mesh *)obedit->data);
|
||||
EditEdge *eed;
|
||||
int clear = RNA_boolean_get(op->ptr, "clear");
|
||||
@ -3612,7 +3612,7 @@ static int editmesh_mark_seam(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -3635,7 +3635,7 @@ void MESH_OT_mark_seam(wmOperatorType *ot)
|
||||
static int editmesh_mark_sharp(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
Mesh *me= ((Mesh *)obedit->data);
|
||||
int set = RNA_boolean_get(op->ptr, "set");
|
||||
EditEdge *eed;
|
||||
@ -3661,7 +3661,7 @@ static int editmesh_mark_sharp(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -4056,7 +4056,7 @@ void righthandfaces(EditMesh *em, int select) /* makes faces righthand turning *
|
||||
static int righthandfaces_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
/* 'standard' behaviour - check if selected, then apply relevant selection */
|
||||
|
||||
@ -4065,7 +4065,7 @@ static int righthandfaces_exec(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); //TODO is this needed ?
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -4276,7 +4276,7 @@ static int smooth_vertex(bContext *C, wmOperator *op)
|
||||
ModifierData *md= obedit->modifiers.first;
|
||||
|
||||
if(em==NULL) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -4287,7 +4287,7 @@ static int smooth_vertex(bContext *C, wmOperator *op)
|
||||
eve= eve->next;
|
||||
}
|
||||
if(teller==0) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -4402,7 +4402,7 @@ static int smooth_vertex(bContext *C, wmOperator *op)
|
||||
|
||||
// DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -4527,13 +4527,13 @@ static int vertices_to_sphere_exec(bContext *C, wmOperator *op)
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
View3D *v3d = CTX_wm_view3d(C);
|
||||
Scene *scene = CTX_data_scene(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
|
||||
vertices_to_sphere(scene, v3d, obedit, em, RNA_float_get(op->ptr,"percent"));
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -4577,7 +4577,7 @@ void flipface(EditMesh *em, EditFace *efa)
|
||||
static int flip_editnormals(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
EditFace *efa;
|
||||
|
||||
efa= em->faces.first;
|
||||
@ -4591,7 +4591,7 @@ static int flip_editnormals(bContext *C, wmOperator *op)
|
||||
/* update vertex normals too */
|
||||
recalc_editnormals(em);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
|
@ -487,7 +487,7 @@ static int removedoublesflag_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Scene *scene = CTX_data_scene(C);
|
||||
EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data));
|
||||
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
|
||||
char msg[100];
|
||||
|
||||
int cnt = removedoublesflag(em,1,0,scene->toolsettings->doublimit);
|
||||
@ -500,7 +500,7 @@ static int removedoublesflag_exec(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -701,7 +701,7 @@ void extrude_mesh(Object *obedit, EditMesh *em, wmOperator *op)
|
||||
static int mesh_extrude_invoke(bContext *C, wmOperator *op, wmEvent *event)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
extrude_mesh(obedit,em, op);
|
||||
|
||||
@ -710,7 +710,7 @@ static int mesh_extrude_invoke(bContext *C, wmOperator *op, wmEvent *event)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -718,13 +718,13 @@ static int mesh_extrude_invoke(bContext *C, wmOperator *op, wmEvent *event)
|
||||
static int mesh_extrude_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh(obedit->data);
|
||||
|
||||
extrude_mesh(obedit,em, op);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -750,7 +750,7 @@ void MESH_OT_extrude(wmOperatorType *ot)
|
||||
static int split_mesh(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
WM_cursor_wait(1);
|
||||
|
||||
@ -765,7 +765,7 @@ static int split_mesh(bContext *C, wmOperator *op)
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
// DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -787,7 +787,7 @@ void MESH_OT_split(wmOperatorType *ot)
|
||||
static int extrude_repeat_mesh(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
RegionView3D *rv3d = CTX_wm_region_view3d(C);
|
||||
|
||||
@ -824,7 +824,7 @@ static int extrude_repeat_mesh(bContext *C, wmOperator *op)
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
// DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -853,7 +853,7 @@ static int spin_mesh(bContext *C, float *dvec, int steps, float degr, int dupli
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
View3D *v3d = CTX_wm_view3d(C);
|
||||
Scene *scene = CTX_data_scene(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
RegionView3D *rv3d= CTX_wm_region_view3d(C);
|
||||
EditVert *eve,*nextve;
|
||||
float nor[3]= {0.0f, 0.0f, 0.0f};
|
||||
@ -936,7 +936,7 @@ static int spin_mesh(bContext *C, float *dvec, int steps, float degr, int dupli
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return ok;
|
||||
}
|
||||
|
||||
@ -977,7 +977,7 @@ void MESH_OT_spin(wmOperatorType *ot)
|
||||
static int screw_mesh_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
EditVert *eve,*v1=0,*v2=0;
|
||||
EditEdge *eed;
|
||||
float dvec[3], nor[3];
|
||||
@ -1013,7 +1013,7 @@ static int screw_mesh_exec(bContext *C, wmOperator *op)
|
||||
}
|
||||
if(v1==NULL || v2==NULL) {
|
||||
BKE_report(op->reports, RPT_ERROR, "You have to select a string of connected vertices too");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1032,16 +1032,16 @@ static int screw_mesh_exec(bContext *C, wmOperator *op)
|
||||
|
||||
if(spin_mesh(C, dvec, turns*steps, 360.0f*turns, 0)) {
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
else {
|
||||
BKE_report(op->reports, RPT_ERROR, "No valid vertices are selected");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
|
||||
void MESH_OT_screw(wmOperatorType *ot)
|
||||
@ -1262,13 +1262,13 @@ static EnumPropertyItem prop_mesh_delete_types[] = {
|
||||
static int delete_mesh_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
delete_mesh(obedit,em, op,RNA_enum_get(op->ptr, "type"));
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -3637,7 +3637,7 @@ static void edge_rotate(EditMesh *em, wmOperator *op, EditEdge *eed,int dir)
|
||||
static int edge_rotate_selected(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
int dir = RNA_int_get(op->ptr,"dir"); // dir == 2 when clockwise and ==1 for counter CW.
|
||||
EditEdge *eed;
|
||||
@ -3676,7 +3676,7 @@ static int edge_rotate_selected(bContext *C, wmOperator *op)
|
||||
else
|
||||
{
|
||||
BKE_report(op->reports, RPT_ERROR, "Select one edge or two adjacent faces");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
}
|
||||
@ -3692,7 +3692,7 @@ static int edge_rotate_selected(bContext *C, wmOperator *op)
|
||||
else
|
||||
{
|
||||
BKE_report(op->reports, RPT_ERROR, "Select one edge or two adjacent faces");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -3704,7 +3704,7 @@ static int edge_rotate_selected(bContext *C, wmOperator *op)
|
||||
|
||||
|
||||
// DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
|
||||
}
|
||||
@ -4759,7 +4759,7 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
|
||||
ARegion *ar= CTX_wm_region(C);
|
||||
RegionView3D *rv3d= ar->regiondata;
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
EditVert *eve, *nextve;
|
||||
EditEdge *eed, *seed= NULL;
|
||||
EditFace *efa, *sefa= NULL;
|
||||
@ -4803,12 +4803,12 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
|
||||
|
||||
if(efa) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Can't perform ripping with faces selected this way");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
if(sefa==NULL) {
|
||||
BKE_report(op->reports, RPT_ERROR, "No proper selection or faces included");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -4873,7 +4873,7 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
|
||||
|
||||
if(seed==NULL) { // never happens?
|
||||
BKE_report(op->reports, RPT_ERROR, "No proper edge found to start");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -4963,7 +4963,7 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
|
||||
// scene->prop_mode = propmode;
|
||||
// XXX scene->proportional = prop;
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -5902,7 +5902,7 @@ void pathselect(EditMesh *em, wmOperator *op)
|
||||
static int region_to_loop(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
EditEdge *eed;
|
||||
EditFace *efa;
|
||||
|
||||
@ -5935,7 +5935,7 @@ static int region_to_loop(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -6080,7 +6080,7 @@ static int loop_bisect(EditMesh *em, Collection *edgecollection){
|
||||
static int loop_to_region(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
|
||||
EditFace *efa;
|
||||
@ -6112,7 +6112,7 @@ static int loop_to_region(bContext *C, wmOperator *op)
|
||||
// if (EM_texFaceCheck())
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -6137,7 +6137,7 @@ void MESH_OT_loop_to_region(wmOperatorType *ot)
|
||||
static int mesh_rotate_uvs(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
EditFace *efa;
|
||||
short change = 0, ccw;
|
||||
@ -6147,7 +6147,7 @@ static int mesh_rotate_uvs(bContext *C, wmOperator *op)
|
||||
|
||||
if (!EM_texFaceCheck(em)) {
|
||||
BKE_report(op->reports, RPT_ERROR, "mesh has no uv/image layers");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -6204,14 +6204,14 @@ static int mesh_rotate_uvs(bContext *C, wmOperator *op)
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
static int mesh_mirror_uvs(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
EditFace *efa;
|
||||
short change = 0, altaxis;
|
||||
@ -6221,7 +6221,7 @@ static int mesh_mirror_uvs(bContext *C, wmOperator *op)
|
||||
|
||||
if (!EM_texFaceCheck(em)) {
|
||||
BKE_report(op->reports, RPT_ERROR, "mesh has no uv/image layers");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -6293,14 +6293,14 @@ static int mesh_mirror_uvs(bContext *C, wmOperator *op)
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
static int mesh_rotate_colors(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
EditFace *efa;
|
||||
short change = 0, ccw;
|
||||
@ -6309,7 +6309,7 @@ static int mesh_rotate_colors(bContext *C, wmOperator *op)
|
||||
|
||||
if (!EM_vertColorCheck(em)) {
|
||||
BKE_report(op->reports, RPT_ERROR, "mesh has no color layers");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -6349,7 +6349,7 @@ static int mesh_rotate_colors(bContext *C, wmOperator *op)
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -6357,7 +6357,7 @@ static int mesh_rotate_colors(bContext *C, wmOperator *op)
|
||||
static int mesh_mirror_colors(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
EditFace *efa;
|
||||
short change = 0, altaxis;
|
||||
@ -6366,7 +6366,7 @@ static int mesh_mirror_colors(bContext *C, wmOperator *op)
|
||||
|
||||
if (!EM_vertColorCheck(em)) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Mesh has no color layers");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -6405,7 +6405,7 @@ static int mesh_mirror_colors(bContext *C, wmOperator *op)
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -6469,13 +6469,13 @@ static int subdivide_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Scene *scene = CTX_data_scene(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
esubdivideflag(obedit, em, 1, 0.0, scene->toolsettings->editbutflag, 1, 0);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -6497,13 +6497,13 @@ static int subdivide_multi_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Scene *scene = CTX_data_scene(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
esubdivideflag(obedit, em, 1, 0.0, scene->toolsettings->editbutflag, RNA_int_get(op->ptr,"number_cuts"), 0);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -6528,13 +6528,13 @@ static int subdivide_multi_fractal_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Scene *scene = CTX_data_scene(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
esubdivideflag(obedit, em, 1, -(RNA_float_get(op->ptr, "random_factor")/100), scene->toolsettings->editbutflag, RNA_int_get(op->ptr, "number_cuts"), 0);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -6560,13 +6560,13 @@ static int subdivide_smooth_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Scene *scene = CTX_data_scene(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
esubdivideflag(obedit, em, 1, 0.292f*RNA_float_get(op->ptr, "smoothness"), scene->toolsettings->editbutflag | B_SMOOTH, 1, 0);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -6901,14 +6901,14 @@ static void fill_mesh(EditMesh *em)
|
||||
static int fill_mesh_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
fill_mesh(em);
|
||||
DAG_object_flush_update(CTX_data_scene(C), obedit, OB_RECALC_DATA);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
|
||||
}
|
||||
@ -6930,13 +6930,13 @@ void MESH_OT_fill(wmOperatorType *ot)
|
||||
static int beauty_fill_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
beauty_fill(em);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -6957,13 +6957,13 @@ void MESH_OT_beauty_fill(wmOperatorType *ot)
|
||||
static int convert_quads_to_tris_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
convert_to_triface(em,0);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -6984,13 +6984,13 @@ void MESH_OT_convert_quads_to_tris(wmOperatorType *ot)
|
||||
static int convert_tris_to_quads_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
join_triangles(em);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -7011,13 +7011,13 @@ void MESH_OT_convert_tris_to_quads(wmOperatorType *ot)
|
||||
static int edge_flip_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
edge_flip(em);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -7038,13 +7038,13 @@ void MESH_OT_edge_flip(wmOperatorType *ot)
|
||||
static int mesh_faces_shade_smooth_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
mesh_set_smooth_faces(em,1);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -7065,13 +7065,13 @@ void MESH_OT_faces_shade_smooth(wmOperatorType *ot)
|
||||
static int mesh_faces_shade_solid_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
mesh_set_smooth_faces(em,0);
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
|
@ -65,11 +65,11 @@
|
||||
static int mesh_add_duplicate_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *ob= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh(ob->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh(ob->data);
|
||||
|
||||
adduplicateflag(em, SELECT);
|
||||
|
||||
EM_EndEditMesh(ob->data, em);
|
||||
BKE_mesh_end_editmesh(ob->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
|
@ -920,7 +920,7 @@ static int return_editmesh_vgroup(Object *obedit, EditMesh *em, char *name, floa
|
||||
static void select_editmesh_hook(Object *ob, HookModifierData *hmd)
|
||||
{
|
||||
Mesh *me= ob->data;
|
||||
EditMesh *em= EM_GetEditMesh(me);
|
||||
EditMesh *em= BKE_mesh_get_editmesh(me);
|
||||
EditVert *eve;
|
||||
int index=0, nr=0;
|
||||
|
||||
@ -932,7 +932,7 @@ static void select_editmesh_hook(Object *ob, HookModifierData *hmd)
|
||||
}
|
||||
EM_select_flush(em);
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
|
||||
static int return_editlattice_indexar(Lattice *editlatt, int *tot, int **indexar, float *cent)
|
||||
@ -1105,15 +1105,15 @@ int hook_getIndexArray(Object *obedit, int *tot, int **indexar, char *name, floa
|
||||
case OB_MESH:
|
||||
{
|
||||
Mesh *me= obedit->data;
|
||||
EditMesh *em = EM_GetEditMesh(me);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(me);
|
||||
|
||||
/* check selected vertices first */
|
||||
if( return_editmesh_indexar(em, tot, indexar, cent_r)) {
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
return 1;
|
||||
} else {
|
||||
int ret = return_editmesh_vgroup(obedit, em, name, cent_r);
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
}
|
||||
case OB_CURVE:
|
||||
@ -2211,7 +2211,7 @@ void make_vertex_parent(Scene *scene, Object *obedit, View3D *v3d)
|
||||
|
||||
if(obedit->type==OB_MESH) {
|
||||
Mesh *me= obedit->data;
|
||||
EditMesh *em = EM_GetEditMesh(me);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(me);
|
||||
|
||||
eve= em->verts.first;
|
||||
while(eve) {
|
||||
@ -2226,7 +2226,7 @@ void make_vertex_parent(Scene *scene, Object *obedit, View3D *v3d)
|
||||
eve= eve->next;
|
||||
}
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
else if(ELEM(obedit->type, OB_SURF, OB_CURVE)) {
|
||||
ListBase *editnurb= curve_get_editcurve(obedit);
|
||||
@ -2846,7 +2846,7 @@ static int object_center_set_exec(bContext *C, wmOperator *op)
|
||||
|
||||
if(obedit->type==OB_MESH) {
|
||||
Mesh *me= obedit->data;
|
||||
EditMesh *em = EM_GetEditMesh(me);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(me);
|
||||
|
||||
for(eve= em->verts.first; eve; eve= eve->next) {
|
||||
if(v3d->around==V3D_CENTROID) {
|
||||
@ -2874,7 +2874,7 @@ static int object_center_set_exec(bContext *C, wmOperator *op)
|
||||
recalc_editnormals(em);
|
||||
tot_change++;
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -217,14 +217,14 @@ int ED_operator_uvedit(bContext *C)
|
||||
EditMesh *em= NULL;
|
||||
|
||||
if(obedit && obedit->type==OB_MESH)
|
||||
em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
if(em && (em->faces.first) && (CustomData_has_layer(&em->fdata, CD_MTFACE))) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return 1;
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -234,14 +234,14 @@ int ED_operator_uvmap(bContext *C)
|
||||
EditMesh *em= NULL;
|
||||
|
||||
if(obedit && obedit->type==OB_MESH)
|
||||
em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
if(em && (em->faces.first)) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return 1;
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -381,7 +381,7 @@ static void image_uvsmenu(bContext *C, uiMenuItem *head, void *arg_unused)
|
||||
static void image_menu_uvlayers(Object *obedit, char *menustr, int *active)
|
||||
{
|
||||
Mesh *me= (Mesh*)obedit->data;
|
||||
EditMesh *em= EM_GetEditMesh(me);
|
||||
EditMesh *em= BKE_mesh_get_editmesh(me);
|
||||
CustomDataLayer *layer;
|
||||
int i, count = 0;
|
||||
|
||||
@ -398,7 +398,7 @@ static void image_menu_uvlayers(Object *obedit, char *menustr, int *active)
|
||||
|
||||
*active= CustomData_get_active_layer(&em->fdata, CD_MTFACE);
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
|
||||
static void do_image_buttons(bContext *C, void *arg, int event)
|
||||
|
@ -249,7 +249,7 @@ static void image_editvertex_buts(const bContext *C, uiBlock *block)
|
||||
|
||||
image_transform_but_attr(sima, &imx, &imy, &step, &digits);
|
||||
|
||||
em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
for (efa= em->faces.first; efa; efa= efa->next) {
|
||||
tf= CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
|
||||
if (simaFaceDraw_Check(efa, tf)) {
|
||||
@ -339,7 +339,7 @@ static void image_editvertex_buts(const bContext *C, uiBlock *block)
|
||||
WM_event_add_notifier(C, NC_IMAGE, sima->image);
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
|
||||
|
||||
@ -443,7 +443,7 @@ static void image_panel_view_properties(const bContext *C, ARegion *ar)
|
||||
|
||||
if (obedit && obedit->type==OB_MESH) {
|
||||
Mesh *me= obedit->data;
|
||||
EditMesh *em= EM_GetEditMesh(me);
|
||||
EditMesh *em= BKE_mesh_get_editmesh(me);
|
||||
|
||||
if(EM_texFaceCheck(em)) {
|
||||
uiDefBut(block, LABEL, B_NOP, "Draw Type:", 10, 80,120,19, 0, 0, 0, 0, 0, "");
|
||||
@ -472,7 +472,7 @@ static void image_panel_view_properties(const bContext *C, ARegion *ar)
|
||||
}
|
||||
}
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
image_editcursor_buts(C, &ar->v2d, block);
|
||||
}
|
||||
|
@ -255,7 +255,7 @@ static void image_refresh(const bContext *C, ScrArea *sa)
|
||||
if(ima && (ima->source==IMA_SRC_VIEWER || sima->pin));
|
||||
else if(obedit && obedit->type == OB_MESH) {
|
||||
Mesh *me= (Mesh*)obedit->data;
|
||||
EditMesh *em= EM_GetEditMesh(me);
|
||||
EditMesh *em= BKE_mesh_get_editmesh(me);
|
||||
MTFace *tf;
|
||||
|
||||
if(em && EM_texFaceCheck(em)) {
|
||||
@ -279,7 +279,7 @@ static void image_refresh(const bContext *C, ScrArea *sa)
|
||||
}
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
}
|
||||
|
||||
@ -758,12 +758,12 @@ int ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit)
|
||||
return 0;
|
||||
|
||||
if(obedit && obedit->type == OB_MESH) {
|
||||
EditMesh *em = EM_GetEditMesh(obedit->data);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(obedit->data);
|
||||
int ret;
|
||||
|
||||
ret = EM_texFaceCheck(em);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -777,12 +777,12 @@ int ED_space_image_show_uvshadow(SpaceImage *sima, Object *obedit)
|
||||
|
||||
if(ED_space_image_show_paint(sima))
|
||||
if(obedit && obedit->type == OB_MESH) {
|
||||
EditMesh *em = EM_GetEditMesh(obedit->data);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(obedit->data);
|
||||
int ret;
|
||||
|
||||
ret = EM_texFaceCheck(em);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -161,7 +161,7 @@ static void v3d_editvertex_buts(const bContext *C, uiBlock *block, View3D *v3d,
|
||||
|
||||
if(ob->type==OB_MESH) {
|
||||
Mesh *me= ob->data;
|
||||
EditMesh *em = EM_GetEditMesh(me);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(me);
|
||||
EditVert *eve, *evedef=NULL;
|
||||
EditEdge *eed;
|
||||
|
||||
@ -210,7 +210,7 @@ static void v3d_editvertex_buts(const bContext *C, uiBlock *block, View3D *v3d,
|
||||
}
|
||||
}
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
else if(ob->type==OB_CURVE || ob->type==OB_SURF) {
|
||||
Curve *cu= ob->data;
|
||||
@ -365,7 +365,7 @@ static void v3d_editvertex_buts(const bContext *C, uiBlock *block, View3D *v3d,
|
||||
|
||||
if(ob->type==OB_MESH) {
|
||||
Mesh *me= ob->data;
|
||||
EditMesh *em = EM_GetEditMesh(me);
|
||||
EditMesh *em = BKE_mesh_get_editmesh(me);
|
||||
EditVert *eve;
|
||||
EditEdge *eed;
|
||||
|
||||
@ -391,7 +391,7 @@ static void v3d_editvertex_buts(const bContext *C, uiBlock *block, View3D *v3d,
|
||||
|
||||
recalc_editnormals(em);
|
||||
|
||||
EM_EndEditMesh(me, em);
|
||||
BKE_mesh_end_editmesh(me, em);
|
||||
}
|
||||
else if(ob->type==OB_CURVE || ob->type==OB_SURF) {
|
||||
Curve *cu= ob->data;
|
||||
|
@ -4886,7 +4886,7 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
|
||||
int bit, ctrl= win->eventstate->ctrl, shift= win->eventstate->shift;
|
||||
|
||||
if(obedit && obedit->type==OB_MESH) {
|
||||
em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
}
|
||||
/* watch it: if sa->win does not exist, check that when calling direct drawing routines */
|
||||
|
||||
@ -5119,7 +5119,7 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
|
||||
}
|
||||
|
||||
if(obedit && obedit->type==OB_MESH)
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
|
||||
static void view3d_header_pulldowns(const bContext *C, uiBlock *block, Object *ob, int *xcoord, int yco)
|
||||
@ -5484,7 +5484,7 @@ void view3d_header_buttons(const bContext *C, ARegion *ar)
|
||||
|
||||
/* selection modus */
|
||||
if(obedit && (obedit->type == OB_MESH)) {
|
||||
EditMesh *em= EM_GetEditMesh((Mesh *)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
|
||||
|
||||
uiBlockBeginAlign(block);
|
||||
uiDefIconButBitS(block, TOG, SCE_SELECT_VERTEX, B_SEL_VERT, ICON_VERTEXSEL, xco,yco,XIC,YIC, &em->selectmode, 1.0, 0.0, 0, 0, "Vertex select mode (Ctrl Tab 1)");
|
||||
@ -5501,7 +5501,7 @@ void view3d_header_buttons(const bContext *C, ARegion *ar)
|
||||
uiBlockEndAlign(block);
|
||||
xco+= 20;
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
else if(G.f & G_PARTICLEEDIT) {
|
||||
uiBlockBeginAlign(block);
|
||||
|
@ -120,7 +120,7 @@ static void draw_uvs_shadow(SpaceImage *sima, Object *obedit)
|
||||
EditFace *efa;
|
||||
TFace *tf;
|
||||
|
||||
em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
|
||||
/* draws the grey mesh when painting */
|
||||
glColor3ub(112, 112, 112);
|
||||
@ -136,7 +136,7 @@ static void draw_uvs_shadow(SpaceImage *sima, Object *obedit)
|
||||
glEnd();
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
|
||||
static int draw_uvs_dm_shadow(DerivedMesh *dm)
|
||||
@ -428,7 +428,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
|
||||
int drawfaces, interpedges, lastsel, sel;
|
||||
Image *ima= sima->image;
|
||||
|
||||
em= EM_GetEditMesh(me);
|
||||
em= BKE_mesh_get_editmesh(me);
|
||||
activetf= EM_get_active_mtface(em, &efa_act, NULL, 0); /* will be set to NULL if hidden */
|
||||
|
||||
settings= scene->toolsettings;
|
||||
@ -826,7 +826,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
|
||||
}
|
||||
|
||||
glPointSize(1.0);
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
|
||||
void draw_uvedit_main(SpaceImage *sima, ARegion *ar, Scene *scene, Object *obedit)
|
||||
|
@ -81,9 +81,9 @@ int ED_uvedit_test(Object *obedit)
|
||||
if(obedit->type != OB_MESH)
|
||||
return 0;
|
||||
|
||||
em = EM_GetEditMesh(obedit->data);
|
||||
em = BKE_mesh_get_editmesh(obedit->data);
|
||||
ret = EM_texFaceCheck(em);
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@ -105,9 +105,9 @@ void ED_uvedit_assign_image(Scene *scene, Object *obedit, Image *ima, Image *pre
|
||||
if(!obedit || (obedit->type != OB_MESH))
|
||||
return;
|
||||
|
||||
em= EM_GetEditMesh(((Mesh*)obedit->data));
|
||||
em= BKE_mesh_get_editmesh(((Mesh*)obedit->data));
|
||||
if(!em || !em->faces.first) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -145,7 +145,7 @@ void ED_uvedit_assign_image(Scene *scene, Object *obedit, Image *ima, Image *pre
|
||||
if(update)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
|
||||
/* dotile - 1, set the tile flag (from the space image)
|
||||
@ -164,7 +164,7 @@ void ED_uvedit_set_tile(bContext *C, Scene *scene, Object *obedit, Image *ima, i
|
||||
if(ima->type==IMA_TYPE_R_RESULT || ima->type==IMA_TYPE_COMPOSITE)
|
||||
return;
|
||||
|
||||
em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
|
||||
for(efa= em->faces.first; efa; efa= efa->next) {
|
||||
tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
|
||||
@ -184,7 +184,7 @@ void ED_uvedit_set_tile(bContext *C, Scene *scene, Object *obedit, Image *ima, i
|
||||
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
|
||||
/*********************** space conversion *********************/
|
||||
@ -368,7 +368,7 @@ void uv_copy_aspect(float uv_orig[][2], float uv[][2], float aspx, float aspy)
|
||||
|
||||
int ED_uvedit_minmax(Scene *scene, Image *ima, Object *obedit, float *min, float *max)
|
||||
{
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
int sel;
|
||||
@ -386,13 +386,13 @@ int ED_uvedit_minmax(Scene *scene, Image *ima, Object *obedit, float *min, float
|
||||
}
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return sel;
|
||||
}
|
||||
|
||||
int uvedit_center(Scene *scene, Image *ima, Object *obedit, float *cent, int mode)
|
||||
{
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
float min[2], max[2];
|
||||
@ -421,11 +421,11 @@ int uvedit_center(Scene *scene, Image *ima, Object *obedit, float *cent, int mod
|
||||
cent[0]= (min[0]+max[0])/2.0;
|
||||
cent[1]= (min[1]+max[1])/2.0;
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return 1;
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -584,7 +584,7 @@ static void find_nearest_uv_vert(Scene *scene, Image *ima, EditMesh *em, float c
|
||||
|
||||
int ED_uvedit_nearest_uv(Scene *scene, Object *obedit, Image *ima, float co[2], float uv[2])
|
||||
{
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
float mindist, dist;
|
||||
@ -614,7 +614,7 @@ int ED_uvedit_nearest_uv(Scene *scene, Object *obedit, Image *ima, float co[2],
|
||||
}
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return found;
|
||||
}
|
||||
|
||||
@ -994,7 +994,7 @@ static void weld_align_uv(bContext *C, int tool)
|
||||
|
||||
scene= CTX_data_scene(C);
|
||||
obedit= CTX_data_edit_object(C);
|
||||
em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
ima= CTX_data_edit_image(C);
|
||||
|
||||
INIT_MINMAX2(min, max);
|
||||
@ -1055,7 +1055,7 @@ static void weld_align_uv(bContext *C, int tool)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
|
||||
static int align_exec(bContext *C, wmOperator *op)
|
||||
@ -1129,7 +1129,7 @@ static int stitch_exec(bContext *C, wmOperator *op)
|
||||
sima= (SpaceImage*)CTX_wm_space_data(C);
|
||||
scene= CTX_data_scene(C);
|
||||
obedit= CTX_data_edit_object(C);
|
||||
em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
ima= CTX_data_edit_image(C);
|
||||
|
||||
if(RNA_boolean_get(op->ptr, "use_limit")) {
|
||||
@ -1145,7 +1145,7 @@ static int stitch_exec(bContext *C, wmOperator *op)
|
||||
vmap= EM_make_uv_vert_map(em, 1, 0, limit);
|
||||
|
||||
if(vmap == NULL) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1276,7 +1276,7 @@ static int stitch_exec(bContext *C, wmOperator *op)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -1309,7 +1309,7 @@ static int select_inverse_exec(bContext *C, wmOperator *op)
|
||||
|
||||
scene= CTX_data_scene(C);
|
||||
obedit= CTX_data_edit_object(C);
|
||||
em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
ima= CTX_data_edit_image(C);
|
||||
|
||||
if(scene->toolsettings->uv_flag & UV_SYNC_SELECTION) {
|
||||
@ -1330,7 +1330,7 @@ static int select_inverse_exec(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -1360,7 +1360,7 @@ static int de_select_all_exec(bContext *C, wmOperator *op)
|
||||
|
||||
scene= CTX_data_scene(C);
|
||||
obedit= CTX_data_edit_object(C);
|
||||
em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
ima= CTX_data_edit_image(C);
|
||||
|
||||
if(scene->toolsettings->uv_flag & UV_SYNC_SELECTION) {
|
||||
@ -1398,7 +1398,7 @@ static int de_select_all_exec(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -1445,7 +1445,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop)
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Image *ima= CTX_data_edit_image(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
NearestHit hit;
|
||||
@ -1480,7 +1480,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop)
|
||||
/* find edge */
|
||||
find_nearest_uv_edge(scene, ima, em, co, &hit);
|
||||
if(hit.efa == NULL) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
}
|
||||
@ -1488,7 +1488,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop)
|
||||
/* find vertex */
|
||||
find_nearest_uv_vert(scene, ima, em, co, penalty, &hit);
|
||||
if(hit.efa == NULL) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1503,7 +1503,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop)
|
||||
/* find edge */
|
||||
find_nearest_uv_edge(scene, ima, em, co, &hit);
|
||||
if(hit.efa == NULL) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1522,7 +1522,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop)
|
||||
/* find face */
|
||||
find_nearest_uv_face(scene, ima, em, co, &hit);
|
||||
if(hit.efa == NULL) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1544,12 +1544,12 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop)
|
||||
find_nearest_uv_vert(scene, ima, em, co, NULL, &hit);
|
||||
|
||||
if(hit.efa==NULL) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
}
|
||||
else {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1702,7 +1702,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_PASS_THROUGH|OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -1808,13 +1808,13 @@ static int select_linked_exec(bContext *C, wmOperator *op)
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Image *ima= CTX_data_edit_image(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
float limit[2];
|
||||
int extend;
|
||||
|
||||
if(scene->toolsettings->uv_flag & UV_SYNC_SELECTION) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Can't select linked when sync selection is enabled.");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1825,7 +1825,7 @@ static int select_linked_exec(bContext *C, wmOperator *op)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -1852,13 +1852,13 @@ static int unlink_selection_exec(bContext *C, wmOperator *op)
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Image *ima= CTX_data_edit_image(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
|
||||
if(scene->toolsettings->uv_flag & UV_SYNC_SELECTION) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Can't unlink selection when sync selection is enabled.");
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1880,7 +1880,7 @@ static int unlink_selection_exec(bContext *C, wmOperator *op)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -1913,7 +1913,7 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje
|
||||
* This only needs to be done when the Mesh is not used for
|
||||
* selection (so for sticky modes, vertex or location based). */
|
||||
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
int nverts, i;
|
||||
@ -1969,7 +1969,7 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje
|
||||
eve->tmp.l = a; */
|
||||
|
||||
if(vmap == NULL) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -2031,7 +2031,7 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje
|
||||
}
|
||||
}
|
||||
}
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
|
||||
static int border_select_exec(bContext *C, wmOperator *op)
|
||||
@ -2041,7 +2041,7 @@ static int border_select_exec(bContext *C, wmOperator *op)
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Image *ima= CTX_data_edit_image(C);
|
||||
ARegion *ar= CTX_wm_region(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tface;
|
||||
rcti rect;
|
||||
@ -2154,11 +2154,11 @@ static int border_select_exec(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -2211,7 +2211,7 @@ int circle_select_exec(bContext *C, wmOperator *op)
|
||||
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
ARegion *ar= CTX_wm_region(C);
|
||||
EditFace *efa;
|
||||
MTFace *tface;
|
||||
@ -2249,7 +2249,7 @@ int circle_select_exec(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -2347,7 +2347,7 @@ void UV_OT_snap_cursor(wmOperatorType *ot)
|
||||
|
||||
static int snap_uvs_to_cursor(Scene *scene, Image *ima, Object *obedit, View2D *v2d)
|
||||
{
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tface;
|
||||
short change= 0;
|
||||
@ -2365,13 +2365,13 @@ static int snap_uvs_to_cursor(Scene *scene, Image *ima, Object *obedit, View2D *
|
||||
}
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return change;
|
||||
}
|
||||
|
||||
static int snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obedit)
|
||||
{
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
EditVert *eve;
|
||||
MTFace *tface;
|
||||
@ -2446,7 +2446,7 @@ static int snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obe
|
||||
if(!change) {
|
||||
MEM_freeN(coords);
|
||||
MEM_freeN(usercount);
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return change;
|
||||
}
|
||||
|
||||
@ -2493,13 +2493,13 @@ static int snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obe
|
||||
MEM_freeN(coords);
|
||||
MEM_freeN(usercount);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return change;
|
||||
}
|
||||
|
||||
static int snap_uvs_to_pixels(SpaceImage *sima, Scene *scene, Object *obedit)
|
||||
{
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
Image *ima= sima->image;
|
||||
EditFace *efa;
|
||||
MTFace *tface;
|
||||
@ -2524,7 +2524,7 @@ static int snap_uvs_to_pixels(SpaceImage *sima, Scene *scene, Object *obedit)
|
||||
}
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return change;
|
||||
}
|
||||
|
||||
@ -2586,7 +2586,7 @@ static int pin_exec(bContext *C, wmOperator *op)
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Image *ima= CTX_data_edit_image(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tface;
|
||||
int clear= RNA_boolean_get(op->ptr, "clear");
|
||||
@ -2614,7 +2614,7 @@ static int pin_exec(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -2640,7 +2640,7 @@ static int select_pinned_exec(bContext *C, wmOperator *op)
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
Image *ima= CTX_data_edit_image(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tface;
|
||||
|
||||
@ -2659,7 +2659,7 @@ static int select_pinned_exec(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -2682,7 +2682,7 @@ static int hide_exec(bContext *C, wmOperator *op)
|
||||
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
int swap= RNA_boolean_get(op->ptr, "unselected");
|
||||
@ -2691,7 +2691,7 @@ static int hide_exec(bContext *C, wmOperator *op)
|
||||
EM_hide_mesh(em, swap);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -2799,7 +2799,7 @@ static int hide_exec(bContext *C, wmOperator *op)
|
||||
EM_validate_selections(em);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -2825,7 +2825,7 @@ static int reveal_exec(bContext *C, wmOperator *op)
|
||||
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
|
||||
@ -2834,7 +2834,7 @@ static int reveal_exec(bContext *C, wmOperator *op)
|
||||
EM_reveal_mesh(em);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -2930,7 +2930,7 @@ static int reveal_exec(bContext *C, wmOperator *op)
|
||||
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
|
@ -72,12 +72,12 @@
|
||||
|
||||
static int ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit)
|
||||
{
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
|
||||
if(ED_uvedit_test(obedit)) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -85,7 +85,7 @@ static int ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit)
|
||||
EM_add_data_layer(em, &em->fdata, CD_MTFACE);
|
||||
|
||||
if(!ED_uvedit_test(obedit)) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -99,7 +99,7 @@ static int ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit)
|
||||
uvedit_face_select(scene, efa, tf);
|
||||
}
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -223,7 +223,7 @@ static void minimize_stretch_init(bContext *C, wmOperator *op)
|
||||
{
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
MinStretch *ms;
|
||||
int fill_holes= RNA_boolean_get(op->ptr, "fill_holes");
|
||||
|
||||
@ -405,7 +405,7 @@ static int pack_islands_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
ParamHandle *handle;
|
||||
|
||||
handle = construct_param_handle(scene, em, 1, 0, 1, 1);
|
||||
@ -416,7 +416,7 @@ static int pack_islands_exec(bContext *C, wmOperator *op)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -438,7 +438,7 @@ static int average_islands_scale_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
ParamHandle *handle;
|
||||
|
||||
handle= construct_param_handle(scene, em, 1, 0, 1, 1);
|
||||
@ -449,7 +449,7 @@ static int average_islands_scale_exec(bContext *C, wmOperator *op)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -471,19 +471,19 @@ static ParamHandle *liveHandle = NULL;
|
||||
|
||||
void ED_uvedit_live_unwrap_begin(Scene *scene, Object *obedit)
|
||||
{
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
short abf = scene->toolsettings->unwrapper == 1;
|
||||
short fillholes = scene->toolsettings->uvcalc_flag & UVCALC_FILLHOLES;
|
||||
|
||||
if(!ED_uvedit_test(obedit)) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return;
|
||||
}
|
||||
|
||||
liveHandle = construct_param_handle(scene, em, 0, fillholes, 1, 1);
|
||||
|
||||
param_lscm_begin(liveHandle, PARAM_TRUE, abf);
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
|
||||
void ED_uvedit_live_unwrap_re_solve(void)
|
||||
@ -606,7 +606,7 @@ static void uv_map_transform(bContext *C, wmOperator *op, float center[3], float
|
||||
/* context checks are messy here, making it work in both 3d view and uv editor */
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
View3D *v3d= CTX_wm_view3d(C);
|
||||
RegionView3D *rv3d= CTX_wm_region_view3d(C);
|
||||
/* common operator properties */
|
||||
@ -633,7 +633,7 @@ static void uv_map_transform(bContext *C, wmOperator *op, float center[3], float
|
||||
else
|
||||
uv_map_rotation_matrix(rotmat, rv3d, obedit, upangledeg, sideangledeg, radius);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
}
|
||||
|
||||
static void uv_transform_properties(wmOperatorType *ot, int radius)
|
||||
@ -786,7 +786,7 @@ static int unwrap_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
ParamHandle *handle;
|
||||
int method = RNA_enum_get(op->ptr, "method");
|
||||
int fill_holes = RNA_boolean_get(op->ptr, "fill_holes");
|
||||
@ -794,7 +794,7 @@ static int unwrap_exec(bContext *C, wmOperator *op)
|
||||
|
||||
/* add uvs if they don't exist yet */
|
||||
if(!ED_uvedit_ensure_uvs(C, scene, obedit)) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -813,7 +813,7 @@ static int unwrap_exec(bContext *C, wmOperator *op)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -898,7 +898,7 @@ static int from_view_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
ARegion *ar= CTX_wm_region(C);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
@ -906,7 +906,7 @@ static int from_view_exec(bContext *C, wmOperator *op)
|
||||
|
||||
/* add uvs if they don't exist yet */
|
||||
if(!ED_uvedit_ensure_uvs(C, scene, obedit)) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -946,7 +946,7 @@ static int from_view_exec(bContext *C, wmOperator *op)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -982,13 +982,13 @@ static int reset_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
|
||||
/* add uvs if they don't exist yet */
|
||||
if(!ED_uvedit_ensure_uvs(C, scene, obedit)) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1013,7 +1013,7 @@ static int reset_exec(bContext *C, wmOperator *op)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -1069,14 +1069,14 @@ static int sphere_project_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
float center[3], rotmat[4][4];
|
||||
|
||||
/* add uvs if they don't exist yet */
|
||||
if(!ED_uvedit_ensure_uvs(C, scene, obedit)) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1101,7 +1101,7 @@ static int sphere_project_exec(bContext *C, wmOperator *op)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -1141,14 +1141,14 @@ static int cylinder_project_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
float center[3], rotmat[4][4];
|
||||
|
||||
/* add uvs if they don't exist yet */
|
||||
if(!ED_uvedit_ensure_uvs(C, scene, obedit)) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1173,7 +1173,7 @@ static int cylinder_project_exec(bContext *C, wmOperator *op)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
@ -1199,7 +1199,7 @@ static int cube_project_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
Object *obedit= CTX_data_edit_object(C);
|
||||
EditMesh *em= EM_GetEditMesh((Mesh*)obedit->data);
|
||||
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
|
||||
EditFace *efa;
|
||||
MTFace *tf;
|
||||
float no[3], cube_size, *loc, dx, dy;
|
||||
@ -1207,7 +1207,7 @@ static int cube_project_exec(bContext *C, wmOperator *op)
|
||||
|
||||
/* add uvs if they don't exist yet */
|
||||
if(!ED_uvedit_ensure_uvs(C, scene, obedit)) {
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1260,7 +1260,7 @@ static int cube_project_exec(bContext *C, wmOperator *op)
|
||||
DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit);
|
||||
|
||||
EM_EndEditMesh(obedit->data, em);
|
||||
BKE_mesh_end_editmesh(obedit->data, em);
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user