svn merge -r 31145:31210 https://svn.blender.org/svnroot/bf-blender/trunk/blender

3 files changed, 14 insertions, 15 deletions

diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index a013177e1b8..973ba896100 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -157,6 +157,11 @@ typedef struct EditNurb {
 
 	/* index data for shape keys */
 	struct GHash *keyindex;
+
+	/* shape key being edited */
+	int shapenr;
+
+	char pad[4];
 } EditNurb;
 
 typedef struct Curve {
diff --git a/source/blender/makesdna/DNA_lattice_types.h b/source/blender/makesdna/DNA_lattice_types.h
index 3a0fcb3c38c..94fc9fefb66 100644
--- a/source/blender/makesdna/DNA_lattice_types.h
+++ b/source/blender/makesdna/DNA_lattice_types.h
@@ -36,6 +36,14 @@ struct Ipo;
 struct Key;
 struct MDeformVert;
 
+typedef struct EditLatt {
+	struct Lattice *latt;
+
+	int shapenr;
+
+	char pad[4];
+} EditLatt;
+
 typedef struct Lattice {
 	ID id;
 	
@@ -58,7 +66,7 @@ typedef struct Lattice {
 	float *latticedata;
 	float latmat[4][4];
 	
-	struct Lattice *editlatt;
+	struct EditLatt *editlatt;
 } Lattice;
 
 /* ***************** LATTICE ********************* */
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index f9d482b2159..d51dec97351 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -44,15 +44,6 @@ typedef struct StripElem {
 	char name[80];
 } StripElem;
 
-typedef struct TStripElem {
-	struct ImBuf *ibuf;
-	struct ImBuf *ibuf_comp;
-	struct TStripElem *se1, *se2, *se3;
-	short ok;
-	short flag;
-	int nr;
-} TStripElem;
-
 typedef struct StripCrop {
 	int top;
 	int bottom;
@@ -95,11 +86,6 @@ typedef struct Strip {
 	StripCrop *crop;
 	StripTransform *transform;
 	StripColorBalance *color_balance;
-	TStripElem *tstripdata;
-	TStripElem *tstripdata_startstill;
-	TStripElem *tstripdata_endstill;
-	struct ImBuf *ibuf_startstill;
-	struct ImBuf *ibuf_endstill;
 } Strip;