Revision: 19655
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19655
Author: joeedh
Date: 2009-04-11 10:26:51 +0200 (Sat, 11 Apr 2009)
Log Message:
-----------
as per discussion with ton, the editmesh accessors now live
in blenkernel.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/BKE_mesh.h
branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
branches/blender2.5/blender/source/blender/blenkernel/intern/mesh.c
branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
branches/blender2.5/blender/source/blender/blenkernel/intern/shrinkwrap.c
branches/blender2.5/blender/source/blender/editors/include/ED_mesh.h
branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_loop.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
branches/blender2.5/blender/source/blender/editors/space_image/image_panels.c
branches/blender2.5/blender/source/blender/editors/space_image/space_image.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_draw.c
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_mesh.h
2009-04-11 06:48:39 UTC (rev 19654)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_mesh.h
2009-04-11 08:26:51 UTC (rev 19655)
@@ -36,6 +36,7 @@
struct BoundBox;
struct DispList;
struct ListBase;
+struct EditMesh;
struct MDeformVert;
struct Mesh;
struct MFace;
@@ -51,6 +52,9 @@
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);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
2009-04-11 06:48:39 UTC (rev 19654)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
2009-04-11 08:26:51 UTC (rev 19655)
@@ -457,11 +457,11 @@
/* 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 @@
Mat4CpyMat4(pmat, par->obmat);
- em = EM_GetEditMesh(me);
+ em = BKE_mesh_get_editmesh(me);
if(em) {
int totvert;
@@ -585,7 +585,7 @@
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);
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
2009-04-11 06:48:39 UTC (rev 19654)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
2009-04-11 08:26:51 UTC (rev 19655)
@@ -392,7 +392,7 @@
{
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 @@
/* free temporary DerivedMesh created (in EditMode case) */
if (em) {
if (dm) dm->release(dm);
- EM_EndEditMesh(me, em);
+ BKE_mesh_end_editmesh(me, em);
}
}
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2009-04-11 06:48:39 UTC (rev 19654)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2009-04-11 08:26:51 UTC (rev 19655)
@@ -2388,7 +2388,7 @@
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 @@
fclose(fp);
- if (em) EM_EndEditMesh(em);
+ if (em) BKE_mesh_end_editmesh(me, em);
}
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/mesh.c
2009-04-11 06:48:39 UTC (rev 19654)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/mesh.c
2009-04-11 08:26:51 UTC (rev 19655)
@@ -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);
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
2009-04-11 06:48:39 UTC (rev 19654)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
2009-04-11 08:26:51 UTC (rev 19655)
@@ -7541,7 +7541,7 @@
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 @@
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;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
2009-04-11 06:48:39 UTC (rev 19654)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
2009-04-11 08:26:51 UTC (rev 19655)
@@ -1642,7 +1642,7 @@
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 @@
break;
}
}
- EM_EndEditMesh(me, em);
+ BKE_mesh_end_editmesh(me, em);
}
else {
DerivedMesh *dm = par->derivedFinal;
@@ -2296,12 +2296,12 @@
/* 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);
}
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/shrinkwrap.c
2009-04-11 06:48:39 UTC (rev 19654)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/shrinkwrap.c
2009-04-11 08:26:51 UTC (rev 19655)
@@ -96,14 +96,14 @@
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
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_mesh.h
2009-04-11 06:48:39 UTC (rev 19654)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_mesh.h
2009-04-11 08:26:51 UTC (rev 19655)
@@ -86,8 +86,8 @@
/*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);
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
2009-04-11 06:48:39 UTC (rev 19654)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
2009-04-11 08:26:51 UTC (rev 19655)
@@ -94,7 +94,7 @@
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 @@
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 @@
/* 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 @@
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 @@
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 @@
}
}
}
- EM_EndEditMesh(me, em);
+ BKE_mesh_end_editmesh(me, em);
}
break;
case OB_LATTICE:
@@ -888,7 +888,7 @@
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 @@
}
}
}
- EM_EndEditMesh(me, em);
+ BKE_mesh_end_editmesh(me, em);
}
break;
case OB_LATTICE:
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
2009-04-11 06:48:39 UTC (rev 19654)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
2009-04-11 08:26:51 UTC (rev 19655)
@@ -1455,10 +1455,10 @@
obedit= editbase->object;
me= obedit->data;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
