forked from bartvdbraak/blender
ShapeKeys RNA Wrapping: Code cleanup
Replaced some manual/inlined operations with their equivalents from the listbase library funcs.
This commit is contained in:
parent
ed5791bd0b
commit
2f45cdb420
@ -57,6 +57,7 @@ static Key *rna_ShapeKey_find_key(ID *id)
|
||||
case ID_KE: return (Key*)id;
|
||||
case ID_LT: return ((Lattice*)id)->key;
|
||||
case ID_ME: return ((Mesh*)id)->key;
|
||||
case ID_OB: return ob_get_key((Object*)id);
|
||||
default: return NULL;
|
||||
}
|
||||
}
|
||||
@ -143,12 +144,9 @@ PointerRNA rna_object_shapekey_index_get(ID *id, int value)
|
||||
Key *key= rna_ShapeKey_find_key(id);
|
||||
KeyBlock *kb= NULL;
|
||||
PointerRNA ptr;
|
||||
int a;
|
||||
|
||||
if (key && value < key->totkey)
|
||||
for(a=0, kb=key->block.first; kb; kb=kb->next, a++)
|
||||
if(a == value)
|
||||
break;
|
||||
kb = BLI_findlink(&key->block, value);
|
||||
|
||||
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)
|
||||
{
|
||||
Key *key= rna_ShapeKey_find_key(id);
|
||||
KeyBlock *kb;
|
||||
int a;
|
||||
|
||||
if(key)
|
||||
for(a=0, kb=key->block.first; kb; kb=kb->next, a++)
|
||||
if(kb == value.data)
|
||||
return a;
|
||||
if (key) {
|
||||
int a = BLI_findindex(&key->block, value.data);
|
||||
if (a >= 0) return a;
|
||||
}
|
||||
|
||||
return current;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user