From 33bfcb26b8997d68adbfbf5931e2157a6ba9fbce Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 12 May 2011 09:02:39 +0000
Subject: manually copy more changes from trunk.

---
 source/blender/makesdna/DNA_key_types.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source/blender/makesdna/DNA_key_types.h')

diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h
index 71b631e3d5e..6bdd63f8483 100644
--- a/source/blender/makesdna/DNA_key_types.h
+++ b/source/blender/makesdna/DNA_key_types.h
@@ -45,7 +45,7 @@ typedef struct KeyBlock {
 	float pos;
 	float curval;
 	short type, adrcode, relative, flag;	/* relative == 0 means first key is reference */
-	int totelem, pad;
+	int totelem, pad2;
 	
 	void *data;
 	float *weights;
@@ -55,7 +55,7 @@ typedef struct KeyBlock {
 	float slidermin;
 	float slidermax;
 
-	int uid, pad2;
+	int uid, pad3;
 } KeyBlock;
 
 
-- 
cgit v1.2.3