diff options
author | Miika Hamalainen <blender@miikah.org> | 2011-10-14 01:43:02 +0400 |
---|---|---|
committer | Miika Hamalainen <blender@miikah.org> | 2011-10-14 01:43:02 +0400 |
commit | 8be3249537e7930e0fa5adb59bc343455da309e9 (patch) | |
tree | 0f4f14b046742f4380540e06c529cd417ddbc541 /source/blender/makesrna/intern/rna_ID.c | |
parent | 8bf78d7f5676520bf6f4241afb88fba506e342f4 (diff) | |
parent | 818c098004ff64adcc0ff24fe29d40850f5591ce (diff) |
Merge with trunk r40991
Diffstat (limited to 'source/blender/makesrna/intern/rna_ID.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index ddd0fcc1007..b366a23c19a 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -317,9 +317,15 @@ static int rna_IDPArray_length(PointerRNA *ptr) int rna_IDMaterials_assign_int(PointerRNA *ptr, int key, const PointerRNA *assign_ptr) { ID *id= ptr->id.data; + short *totcol= give_totcolp_id(id); Material *mat_id= assign_ptr->id.data; - assign_material_id(id, mat_id, key + 1); - return 1; + if(totcol && (key >= 0 && key < *totcol)) { + assign_material_id(id, mat_id, key + 1); + return 1; + } + else { + return 0; + } } #else |