From b82a48a9b11ec53c3a2278dab88f710b7c1a5611 Mon Sep 17 00:00:00 2001
From: Marion <marion.zepf@gmail.com>
Date: Fri, 05 Jul 2013 09:41:15 +0000
Subject: Merge branch 'turtle-centric-2' of git://git.sugarlabs.org/turtleart/mainline

---
(limited to 'TurtleArt/taturtle.py')

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
--
cgit v0.9.1