diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-20 17:34:04 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-20 17:34:04 +0400 |
| commit | a47c673b5525fde6484d4392160fbb5101f2c108 (patch) | |
| tree | cb05981d656de969d91e12d8f74a34bfaf2ed810 /source/blender/editors/interface/interface_icons.c | |
| parent | 56b726917d35ac51c86c3fd10580ac740124494d (diff) | |
2.5 Material:
* Added material "type" property, with Surface/Volume/Halo
options, compatible with sim_physics, as requested for
material buttons layout. Obviously the Volume setting
does nothing currently.
* Deprecated MA_HALO flag in favor of this.
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 0c97c1fd008..1b23967a32d 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -813,7 +813,7 @@ static void icon_set_image(ID *id, DrawInfo *di, PreviewImage* prv_img, int mipl } else if (GS(id->name) == ID_MA) { Material* mat = (Material*)id; - if (mat->mode & MA_HALO) { + if (mat->material_type == MA_TYPE_HALO) { set_alpha( (char*) ri.rect, ri.pr_rectx, ri.pr_recty, 255); } } |