code cleanup: when extending name length Key.elemstr was incorrectly extended to 64 chars, added comment and set back to original length.

This commit is contained in:
Campbell Barton
2012-04-14 02:48:56 +00:00
parent c8a1ef78c0
commit 289f627f63
2 changed files with 8 additions and 5 deletions

View File

@@ -69,7 +69,7 @@
#define KEY_MODE_BPOINT 1
#define KEY_MODE_BEZTRIPLE 2
// old defines from DNA_ipo_types.h for data-type
/* old defines from DNA_ipo_types.h for data-type, stored in DNA - don't modify! */
#define IPO_FLOAT 4
#define IPO_BEZTRIPLE 100
#define IPO_BPOINT 101
@@ -660,7 +660,7 @@ static void cp_key(const int start, int end, const int tot, char *poin, Key *key
return;
}
poin += ofsp[0];
poin += *ofsp;
cp += 2; ofsp++;
}
@@ -796,7 +796,7 @@ void do_rel_key(const int start, int end, const int tot, char *basispoin, Key *k
return;
}
poin += ofsp[0];
poin += *ofsp;
cp += 2;
ofsp++;
@@ -963,7 +963,7 @@ static void do_key(const int start, int end, const int tot, char *poin, Key *key
return;
}
poin += ofsp[0];
poin += *ofsp;
cp += 2;
ofsp++;
}

View File

@@ -61,7 +61,10 @@ typedef struct Key {
struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
KeyBlock *refkey;
char elemstr[64]; /* MAX_NAME */
/* this is not a regular string, although it is \0 terminated
* this is an array of (element_array_size, element_type) pairs
* (each one char) used for calculating shape key-blocks */
char elemstr[32];
int elemsize;
float curval DNA_DEPRECATED;