Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TurtleArt/taturtle.py
diff options
context:
space:
mode:
authorMarion <marion.zepf@gmail.com>2013-07-05 09:41:15 (GMT)
committer Marion <marion.zepf@gmail.com>2013-07-05 09:41:15 (GMT)
commitb82a48a9b11ec53c3a2278dab88f710b7c1a5611 (patch)
tree3b4d32bdd9f8eafd4221516770e12144c23c81ea /TurtleArt/taturtle.py
parent20795e5eb541fc5737b0f86b9328348416c227fd (diff)
parent8e463c960037c395d5f8368e26e28e0b54c5565e (diff)
Merge branch 'turtle-centric-2' of git://git.sugarlabs.org/turtleart/mainline
Diffstat (limited to 'TurtleArt/taturtle.py')
-rw-r--r--TurtleArt/taturtle.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/TurtleArt/taturtle.py b/TurtleArt/taturtle.py
index 030d58d..a22cab6 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