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/space_view3d/drawobject.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/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index f2528f0241f..054cd4e966e 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2281,7 +2281,7 @@ static void draw_mesh_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base Object *ob= base->object; Mesh *me = ob->data; Material *ma= give_current_material(ob, 1); - int hasHaloMat = (ma && (ma->mode&MA_HALO)); + int hasHaloMat = (ma && (ma->material_type == MA_TYPE_HALO)); int draw_wire = 0; int totvert, totedge, totface; DispList *dl; |