diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-06-06 14:35:50 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-06-06 14:35:50 +0400 |
| commit | 7f3908af65a2dc7b3cb3dd100e3bdf7c4f9468d2 (patch) | |
| tree | 26968f5913dec5c6718a56911017cbcf30f64a36 | |
| parent | 88fa58c437ef926495bbf016d0f14139df04ddea (diff) | |
Fix for #2689
When drawing many stars (or for certain slow gfx cards) you can press ESC
to stop it from drawing. The variable set for this escape was not reset,
causing a first F12 render to not work. (Ancient bug!).
Added: redraw event for "Stars" button in worldbuttons.
| -rw-r--r-- | source/blender/src/buttons_shading.c | 2 | ||||
| -rw-r--r-- | source/blender/src/drawview.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 4dfdd086d52..29c79ec0d30 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -1882,7 +1882,7 @@ static void world_panel_mistaph(World *wrld) uiBlockEndAlign(block); uiBlockSetCol(block, TH_BUT_SETTING1); - uiDefButS(block, TOG|BIT|1,B_DIFF, "Stars",160,120,140,19, &wrld->mode, 0, 0, 0, 0, "Toggles starfield generation"); + uiDefButS(block, TOG|BIT|1,REDRAWVIEW3D, "Stars",160,120,140,19, &wrld->mode, 0, 0, 0, 0, "Toggles starfield generation"); uiBlockSetCol(block, TH_AUTO); uiBlockBeginAlign(block); diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 4f7fd109621..9036e5e6fca 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -1836,9 +1836,11 @@ void drawview3dspace(ScrArea *sa, void *spacedata) drawfloor(); if(G.vd->persp==2) { if(G.scene->world) { - if(G.scene->world->mode & WO_STARS) RE_make_stars(star_stuff_init_func, - star_stuff_vertex_func, - star_stuff_term_func); + if(G.scene->world->mode & WO_STARS) { + RE_make_stars(star_stuff_init_func, star_stuff_vertex_func, + star_stuff_term_func); + G.afbreek= 0; /* silly, stars draw uses blender_test_break(), can cause render to stop */ + } } if(G.vd->flag & V3D_DISPBGPIC) draw_bgpic(); } |