sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

ShapeKeys RNA Wrapping: Code cleanup

Browse Source 
Replaced some manual/inlined operations with their equivalents from
the listbase library funcs.
This commit is contained in:
Joshua Leung 2011-01-26 10:46:43 +00:00
parent ed5791bd0b
commit 2f45cdb420
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/blender/makesrna/intern/rna_key.c
View File

@ -57,6 +57,7 @@ static Key *rna_ShapeKey_find_key(ID *id)
case ID_KE: return (Key*)id; case ID_KE: return (Key*)id;
case ID_LT: return ((Lattice*)id)->key; case ID_LT: return ((Lattice*)id)->key;
case ID_ME: return ((Mesh*)id)->key; case ID_ME: return ((Mesh*)id)->key;
case ID_OB: return ob_get_key((Object*)id);
default: return NULL; default: return NULL;
} }
} }
@ -143,12 +144,9 @@ PointerRNA rna_object_shapekey_index_get(ID *id, int value)
Key *key= rna_ShapeKey_find_key(id); Key *key= rna_ShapeKey_find_key(id);
KeyBlock *kb= NULL; KeyBlock *kb= NULL;
PointerRNA ptr; PointerRNA ptr;
int a;
if(key && value < key->totkey) if (key && value < key->totkey)
for(a=0, kb=key->block.first; kb; kb=kb->next, a++) kb = BLI_findlink(&key->block, value);
if(a == value)
break;
RNA_pointer_create(id, &RNA_ShapeKey, kb, &ptr); RNA_pointer_create(id, &RNA_ShapeKey, kb, &ptr);
@ -158,13 +156,11 @@ PointerRNA rna_object_shapekey_index_get(ID *id, int value)
int rna_object_shapekey_index_set(ID *id, PointerRNA value, int current) int rna_object_shapekey_index_set(ID *id, PointerRNA value, int current)
{ {
Key *key= rna_ShapeKey_find_key(id); Key *key= rna_ShapeKey_find_key(id);
KeyBlock *kb;
int a;
if(key) if (key) {
for(a=0, kb=key->block.first; kb; kb=kb->next, a++) int a = BLI_findindex(&key->block, value.data);
if(kb == value.data) if (a >= 0) return a;
return a; }
return current; return current;
} }
@ -286,17 +282,17 @@ static void rna_ShapeKey_data_begin(CollectionPropertyIterator *iter, PointerRNA
Curve *cu; Curve *cu;
Nurb *nu; Nurb *nu;
int tot= kb->totelem, size= key->elemsize; int tot= kb->totelem, size= key->elemsize;
if(GS(key->from->name) == ID_CU) { if(GS(key->from->name) == ID_CU) {
cu= (Curve*)key->from; cu= (Curve*)key->from;
nu= cu->nurb.first; nu= cu->nurb.first;
if(nu->bezt) { if(nu->bezt) {
tot /= 3; tot /= 3;
size *= 3; size *= 3;
} }
} }
rna_iterator_array_begin(iter, (void*)kb->data, size, tot, 0, NULL); rna_iterator_array_begin(iter, (void*)kb->data, size, tot, 0, NULL);
} }
@ -307,15 +303,15 @@ static int rna_ShapeKey_data_length(PointerRNA *ptr)
Curve *cu; Curve *cu;
Nurb *nu; Nurb *nu;
int tot= kb->totelem; int tot= kb->totelem;
if(GS(key->from->name) == ID_CU) { if(GS(key->from->name) == ID_CU) {
cu= (Curve*)key->from; cu= (Curve*)key->from;
nu= cu->nurb.first; nu= cu->nurb.first;
if(nu->bezt) if(nu->bezt)
tot /= 3; tot /= 3;
} }
return tot; return tot;
} }
@ -325,11 +321,11 @@ static PointerRNA rna_ShapeKey_data_get(CollectionPropertyIterator *iter)
StructRNA *type; StructRNA *type;
Curve *cu; Curve *cu;
Nurb *nu; Nurb *nu;
if(GS(key->from->name) == ID_CU) { if(GS(key->from->name) == ID_CU) {
cu= (Curve*)key->from; cu= (Curve*)key->from;
nu= cu->nurb.first; nu= cu->nurb.first;
if(nu->bezt) if(nu->bezt)
type= &RNA_ShapeKeyBezierPoint; type= &RNA_ShapeKeyBezierPoint;
else else