Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.0.x

tacaswell · tacaswell · commit 19de414d258e · 2015-11-04T22:40:09.000-05:00
diff --git a/doc/_templates/citing.html b/doc/_templates/citing.html
@@ -28,6 +28,7 @@ <h1>Citing matplotlib</h1>
 
 <h2>DOIs</h2>
 <dl>
+  <dt>v1.5.0</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.32914"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.32914.svg" alt="10.5281/zenodo.32914"></a></dd>
   <dt>v1.4.3</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.15423"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.15423.svg" alt="10.5281/zenodo.15423"></a></dd>
   <dt>v1.4.2</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.12400"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.12400.png" alt="10.5281/zenodo.12400"></a></dd>
   <dt>v1.4.1</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.12287"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.12287.png" alt="10.5281/zenodo.12287"></a></dd>
diff --git a/doc/style_changes.rst b/doc/style_changes.rst
@@ -22,15 +22,11 @@ All four color maps will be included in matplotlib 1.5.
 Everything Else
 ---------------
 
-We are soliciting proposals to change any and all visual defaults
+We have collected proposals to change any and all visual defaults
 (including adding new rcParams as needed).
 
-If you have a proposal please create an issue or PR on `github <https://github.com/matplotlib/matplotlib/issues/new>`_ with the
-changes to `rcsetup.py` and `matplotlibrc.template` by August 9, 2015.
-
-In the second week of August, Michael Droettboom and Thomas Caswell
-will decide on the new default styles, with the release of 2.0 by the
-beginning of September 2015.
+Michael Droettboom and Thomas Caswell will decide on the new default
+styles to appear in the upcoming 2.0 release.
 
 A 'classic' style sheet will be provided so reverting to the 1.x
 default values will be a single line of python
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -771,7 +771,8 @@ def save(self, filename, writer=None, fps=None, dpi=None, codec=None,
         with writer.saving(self._fig, filename, dpi):
             for anim in all_anim:
                 # Clear the initial frame
-                anim._init_draw()
+                if anim._init_func:
+                    anim._init_draw()
             for data in zip(*[a.new_saved_frame_seq()
                               for a in all_anim]):
                 for anim, d in zip(all_anim, data):
