Merge remote-tracking branch 'origin/rewrite' into rewrite

2012-01-02 00:30:29 -05:00
parent 16df71b060 a098e5d01a
commit 948073fb9d
8 changed files with 32 additions and 17 deletions
--- a/overviewer_core/tileset.py
+++ b/overviewer_core/tileset.py
@@ -533,7 +533,7 @@ class TileSet(object):
        stime = time.time()

        rendercheck = self.options['renderchecks']
-        rerender_prob = self.options['rerender_prob']
+        rerender_prob = self.options['rerenderprob']

        # XXX TODO:
        last_rendertime = 0 # TODO