diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-24 22:39:00 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-24 22:39:00 +0400 |
commit | 169fdf9e9757a8c31d950f5902d7c4cfd1f96a88 (patch) | |
tree | 4b18011879ca26c5fd3fd5fa149a3d6eb9c10423 /source/blender/editors/space_buttons/buttons_context.c | |
parent | b6241e7b7cdc7106db440f57808fc312593974ae (diff) |
2.5: bug fixes for some erratice materials buttons drawing.
Diffstat (limited to 'source/blender/editors/space_buttons/buttons_context.c')
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index cba9a4cf8fc..01794d1bba8 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -552,7 +552,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r if(ptr) { Object *ob= ptr->data; - if(ob && ob->type && (ob->type<OB_LAMP)) + if(ob && ob->type && (ob->type<OB_LAMP) && ob->totcol) CTX_data_pointer_set(result, &ob->id, &RNA_MaterialSlot, ob->mat+ob->actcol-1); } |