diff options
author | Ton Roosendaal <ton@blender.org> | 2009-01-02 22:10:35 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-01-02 22:10:35 +0300 |
commit | a6721c60d9bc0897e3ce0dc87264fbc705284397 (patch) | |
tree | 12dd77160bcfaa4b37e85a5e8ed29496bb6c0705 /source/blender/makesdna | |
parent | 16ca4b572e07aa0f83158c187a7c64b27675d4c9 (diff) |
2.5
From the anti-globalization department:
G.obedit terminated!
Wherever possible, use CTX_data_edit_object(C) to get this
now. It's stored in scene now, and the screen context has
it defined.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_armature_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_curve_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_lattice_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_meta_types.h | 1 |
5 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index 790b9835b68..69b5e9b0f92 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -71,6 +71,8 @@ typedef struct bArmature { ID id; ListBase bonebase; ListBase chainbase; + ListBase *edbo; /* editbone listbase, we use pointer so we can check state */ + int flag; int drawtype; short deformflag; diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index ebd060776e9..01cd5b1f591 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -139,9 +139,10 @@ typedef struct Curve { struct BoundBox *bb; ListBase nurb; /* actual data */ - ListBase editlist; /* edited data, not in file */ ListBase disp; + ListBase *editnurb; /* edited data, not in file, use pointer so we can check for it */ + struct Object *bevobj, *taperobj, *textoncurve; struct Ipo *ipo; Path *path; @@ -173,6 +174,7 @@ typedef struct Curve { float linewidth; char *str; + char *editstr; char family[24]; struct VFont *vfont; struct VFont *vfontb; diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index e6b18641d2a..7995ce44ec3 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -75,6 +75,8 @@ typedef struct CustomData { #define CD_MLOOPCOL 17 #define CD_TANGENT 18 #define CD_NUMTYPES 19 + /* fake type, derivedmesh wants CustomDataMask for weightpaint too, is not stored */ +#define CD_WEIGHTPAINT 30 /* Bits for CustomDataMask */ #define CD_MASK_MVERT (1 << CD_MVERT) @@ -97,6 +99,8 @@ typedef struct CustomData { #define CD_MASK_MLOOPCOL (1 << CD_MLOOPCOL) #define CD_MASK_TANGENT (1 << CD_TANGENT) +/* derivedmesh wants CustomDataMask for weightpaint too, is not customdata though */ +#define CD_MASK_WEIGHTPAINT (1 << CD_WEIGHTPAINT) /* CustomData.flag */ diff --git a/source/blender/makesdna/DNA_lattice_types.h b/source/blender/makesdna/DNA_lattice_types.h index e889e08b066..3f45a3c1fb0 100644 --- a/source/blender/makesdna/DNA_lattice_types.h +++ b/source/blender/makesdna/DNA_lattice_types.h @@ -52,6 +52,8 @@ typedef struct Lattice { struct Key *key; struct MDeformVert *dvert; + + struct Lattice *editlatt; } Lattice; /* ***************** LATTICE ********************* */ diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h index d0ebd937740..862f3ca184b 100644 --- a/source/blender/makesdna/DNA_meta_types.h +++ b/source/blender/makesdna/DNA_meta_types.h @@ -65,6 +65,7 @@ typedef struct MetaBall { ListBase elems; ListBase disp; + ListBase *editelems; /* not saved in files, note we use pointer for editmode check */ struct Ipo *ipo; /* material of the mother ball will define the material used of all others */ |