diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-04-20 20:12:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-20 20:12:39 +0400 |
| commit | 37542017209bf831235fb1645d31b0275642da87 (patch) | |
| tree | 534dc377a36a459ce5ab2aefffa148b7624e4b4c /source/blender/blenkernel/intern/material.c | |
| parent | ed4377faa76f67ee10fd7e374da0c6f5f120c0fe (diff) | |
fix for crash getting the current material & more verbose library errors
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index f3096cdf8f2..3b6a10c0872 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -451,7 +451,7 @@ Material *give_current_material(Object *ob, int act) if(act>ob->totcol) act= ob->totcol; else if(act<=0) act= 1; - if(ob->matbits[act-1]) { /* in object */ + if(ob->matbits && ob->matbits[act-1]) { /* in object */ ma= ob->mat[act-1]; } else { /* in data */ |