diff options
| author | Marion <marion.zepf@gmail.com> | 2013-07-05 09:41:45 (GMT) |
|---|---|---|
| committer | Marion <marion.zepf@gmail.com> | 2013-07-05 09:41:45 (GMT) |
| commit | f5f60856ba3a8101b0935cc14483eec3050c08fd (patch) | |
| tree | a62461481b9765bdfd16cb34935982801d0e314e /TurtleArt/taturtle.py | |
| parent | aca7f3c6f95b483e38434a435a63db663c9e4593 (diff) | |
| parent | b82a48a9b11ec53c3a2278dab88f710b7c1a5611 (diff) | |
Merge branch 'master' into running-turtleartturtle-centric-2
Diffstat (limited to 'TurtleArt/taturtle.py')
| -rw-r--r-- | TurtleArt/taturtle.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/TurtleArt/taturtle.py b/TurtleArt/taturtle.py index 970b39a..12882db 100644 --- a/TurtleArt/taturtle.py +++ b/TurtleArt/taturtle.py @@ -27,7 +27,6 @@ import cairo from random import uniform from math import sin, cos, pi, sqrt - from taconstants import (TURTLE_LAYER, DEFAULT_TURTLE_COLORS, DEFAULT_TURTLE, COLORDICT) from tasprite_factory import SVG, svg_str_to_pixbuf @@ -351,6 +350,8 @@ class Turtle: color = COLORDICT[color][0] else: color = self._pen_color + elif color is None: + color = self._pen_color try: self._pen_color = color |