diff options
| author | Ton Roosendaal <ton@blender.org> | 2003-11-27 00:54:33 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2003-11-27 00:54:33 +0300 |
| commit | b25a9dc8a34c6fa3e0fe9b4c7640090894493cdf (patch) | |
| tree | 41e67d10bbad938847fdc667ca2962d14a3a8476 | |
| parent | 56ad2b9705230f6906fb9a8f32c84ff084c05f32 (diff) | |
- bug fix #732
when you set halo, and star, then disable halo, the texface flag was set.
this is because both values use the same bit in the flag <blush>
solved by clearing the 'star' flag when you disable halo.
Not perfect, but at least it looks OK. :)
| -rw-r--r-- | source/blender/src/buttons_shading.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index e37f4126852..646c44c6eb0 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -1946,6 +1946,13 @@ void do_matbuts(unsigned short event) BIF_preview_changed(G.buts); allqueue(REDRAWBUTSSHADING, 0); break; + case B_MATHALO: + /* when halo is disabled, clear star flag, this is the same as MA_FACETEXTURE <blush> */ + ma= G.buts->lockpoin; + if((ma->mode & MA_HALO)==0) ma->mode &= ~MA_STAR; + BIF_preview_changed(G.buts); + allqueue(REDRAWBUTSSHADING, 0); + break; case B_TEXCLEAR: ma= G.buts->lockpoin; mtex= ma->mtex[(int) ma->texact ]; @@ -2207,7 +2214,7 @@ static void material_panel_shading(Material *ma) if(uiNewPanel(curarea, block, "Shaders", "Material", 640, 0, 318, 204)==0) return; uiBlockSetCol(block, TH_BUT_SETTING1); - uiDefButI(block, TOG|BIT|5, B_MATPRV_DRAW, "Halo", 245,180,65,18, &(ma->mode), 0, 0, 0, 0, "Render as a halo"); + uiDefButI(block, TOG|BIT|5, B_MATHALO, "Halo", 245,180,65,18, &(ma->mode), 0, 0, 0, 0, "Render as a halo"); uiBlockSetCol(block, TH_AUTO); if(ma->mode & MA_HALO) { |