diff options
author | Ton Roosendaal <ton@blender.org> | 2008-12-31 20:11:42 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2008-12-31 20:11:42 +0300 |
commit | c9b60a7b64c75bf999cb8390b328aa42e7a5f53f (patch) | |
tree | ebd8dc28b62913d6fa7d675c6d21ac31c5c3119e /source/blender/makesdna | |
parent | b65a3e9337ac1d9c3870e0e04ee96090bc7e9b23 (diff) |
2.5
So, editmode mesh is back! :)
At the moment only TABkey works and mouse select, 1 vertex at a
time. More will follow of course.
Note for the devs:
- G.editMesh has been removed, be careful with old code.
- EditMesh now is property of Mesh itself
Although it means unlimited editmodes, for migration purposes we
better stick to 1 "obedit" per scene, which is in Context too
- G.obedit will get removed soon, so use CTX_data_edit_object(C)
Or if you can't, just scene->obedit for now
- Also removed the CTX_data_edit_mesh(), this has no meaning
anymore. EditMesh is not context senstitive anymore, only the
edit-object for time being is.
- Martin: I've already tucked some EditMesh pointer in T and
removed all G.editMesh there.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_curve_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 5 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index eb8814171ce..ebd060776e9 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -138,8 +138,10 @@ typedef struct Curve { struct BoundBox *bb; - ListBase nurb; + ListBase nurb; /* actual data */ + ListBase editlist; /* edited data, not in file */ ListBase disp; + struct Object *bevobj, *taperobj, *textoncurve; struct Ipo *ipo; Path *path; diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 752a2360905..8e9341cae0f 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -46,6 +46,7 @@ struct Mesh; struct OcInfo; struct Multires; struct PartialVisibility; +struct EditMesh; typedef struct Mesh { ID id; @@ -63,11 +64,13 @@ typedef struct Mesh { struct TFace *tface; /* depecrated, use mtface */ struct MVert *mvert; /* array of verts */ struct MEdge *medge; /* array of edges */ - struct MDeformVert *dvert; /* __NLA */ + struct MDeformVert *dvert; /* deformgroup vertices */ struct MCol *mcol; /* array of colors, this must be the number of faces * 4 */ struct MSticky *msticky; struct Mesh *texcomesh; struct MSelect *mselect; + + struct EditMesh *edit_mesh; /* not saved in file! */ struct CustomData vdata, edata, fdata; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 325809dd588..f3ec189a9e7 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -517,6 +517,7 @@ typedef struct Scene { ListBase base; struct Base *basact; + struct Object *obedit; /* name replaces old G.obedit */ float cursor[3]; float twcent[3]; /* center for transform widget */ |