Stupid me! Committed in wrong console with wrong dir... here's the rest of

all files for the Ipo/Action/NLA makeover...

6 files changed, 33 insertions, 17 deletions

diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 86ee9eabb15..da1bd98a603 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -123,14 +123,20 @@ typedef struct Library {
 #define ID_SAMPLE	MAKE_ID2('S', 'A')
 #define ID_GR		MAKE_ID2('G', 'R')
 #define ID_ID		MAKE_ID2('I', 'D')
-#define ID_SEQ		MAKE_ID2('S', 'Q')
 #define ID_AR		MAKE_ID2('A', 'R')
 #define ID_AC		MAKE_ID2('A', 'C')
 #define ID_SCRIPT	MAKE_ID2('P', 'Y')
 
-#define IPO_CO		MAKE_ID2('C', 'O')	/* NOTE! This is not an ID, but is needed for g.sipo->blocktype */
-#define ID_NLA		MAKE_ID2('N', 'L')	/* fake ID for outliner */
-							 
+	/* NOTE! Fake IDs, needed for g.sipo->blocktype or outliner */
+#define ID_SEQ		MAKE_ID2('S', 'Q')
+			/* constraint */
+#define ID_CO		MAKE_ID2('C', 'O')
+			/* pose (action channel, used to be ID_AC in code, so we keep code for backwards compat) */
+#define ID_PO		MAKE_ID2('A', 'C')
+			/* used in outliner... */
+#define ID_NLA		MAKE_ID2('N', 'L')
+
+
 /* id->flag: set frist 8 bits always at zero while reading */
 #define LIB_LOCAL		0
 #define LIB_EXTERN		1
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 872d4b8e1ce..90f8760462b 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -91,8 +91,6 @@ typedef struct bActionChannel {
 typedef struct bAction {
 	ID				id;
 	ListBase		chanbase;	/* Channels in this action */
-	bActionChannel	*achan;		/* Current action channel */
-	bPoseChannel	*pchan;		/* Current pose channel */
 } bAction;
 
 typedef struct SpaceAction {
diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h
index 49c8363192c..17a15fecfcf 100644
--- a/source/blender/makesdna/DNA_nla_types.h
+++ b/source/blender/makesdna/DNA_nla_types.h
@@ -56,10 +56,11 @@ typedef struct bActionStrip {
 #define ACTSTRIPMODE_BLEND		0
 #define ACTSTRIPMODE_ADD		1
 
-#define ACTSTRIP_SELECT			0x00000001
-#define ACTSTRIP_USESTRIDE		0x00000002
-#define ACTSTRIP_BLENDTONEXT	0x00000004
-#define ACTSTRIP_HOLDLASTFRAME	0x00000008
+#define ACTSTRIP_SELECT			0x01
+#define ACTSTRIP_USESTRIDE		0x02
+#define ACTSTRIP_BLENDTONEXT	0x04
+#define ACTSTRIP_HOLDLASTFRAME	0x08
+#define ACTSTRIP_ACTIVE			0x10
 
 #endif
 
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index b4f0c369d55..187aeb51dfe 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -113,10 +113,13 @@ typedef struct Object {
 	float imat[4][4];	/* for during render, old game engine, temporally: ipokeys of transform  */
 	
 	unsigned int lay;				/* copy of Base */
+	
 	short flag;			/* copy of Base */
 	short colbits;		/* when zero, from obdata */
-	char transflag, ipoflag;
-	char trackflag, upflag;
+	
+	short transflag, ipoflag;	/* transformation and ipo settings */
+	short trackflag, upflag;
+	short nlaflag, pad;
 	short ipowin, scaflag;	/* ipowin: blocktype last ipowindow */
 	short scavisflag, boundtype;
 	
@@ -255,7 +258,7 @@ extern Object workob;
 #define PARBONE			7
 #define PARSLOW			16
 
-/* char! transflag */
+/* (short) transflag */
 #define OB_OFFS_LOCAL	1
 #define OB_QUAT			2
 #define OB_NEG_SCALE	4
@@ -267,7 +270,7 @@ extern Object workob;
 
 #define OB_POWERTRACK	128
 
-/* char! ipoflag */
+/* (short) ipoflag */
 #define OB_DRAWKEY			1
 #define OB_DRAWKEYSEL		2
 #define OB_OFFS_OB			4
@@ -276,9 +279,11 @@ extern Object workob;
 #define OB_OFFS_PATH		32
 #define OB_OFFS_PARENT		64
 #define OB_OFFS_PARTICLE	128
+	/* get ipo from from action or not? */
+#define OB_ACTION_OB		256
+#define OB_ACTION_KEY		512
 
-
-/* trackflag / upflag */
+/* (short) trackflag / upflag */
 #define OB_POSX			0
 #define OB_POSY			1
 #define OB_POSZ			2
@@ -288,7 +293,7 @@ extern Object workob;
 
 /* gameflag in game.h */
 
-/* dt: nummers */
+/* dt: no flags */
 #define OB_BOUNDBOX		1
 #define OB_WIRE			2
 #define OB_SOLID		3
@@ -379,6 +384,8 @@ extern Object workob;
 #define OB_SHAPE_LOCK		1
 #define OB_SHAPE_TEMPLOCK	2
 
+/* ob->nlaflag */
+#define OB_NLA_OVERRIDE		1
 
 /* ob->softflag in DNA_object_force.h */
 
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 1c282969646..f56f620cc0e 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -86,8 +86,11 @@ typedef struct SpaceIpo {
 	
 	void *editipo;
 	ListBase ipokey;
+	
+	/* the ipo context we need to store */
 	struct Ipo *ipo;
 	struct ID *from;
+	char actname[32], constname[32];
 
 	short totipo, pin;
 	short butofs, channel;
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 7d00460403a..6aac12ea622 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -87,6 +87,7 @@ typedef struct ThemeSpace {
 	char face_dot[4];	// selected color
 	char normal[4];
 	char bone_solid[4], bone_pose[4];
+	char strip[4], strip_select[4];
 	
 	char vertex_size, facedot_size;
 	char bpad[2];