From 77d59213300b645df1644593ba23b87adfb7336b Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Tue, 12 Nov 2013 19:08:28 +0000
Subject: don't ever label blocks with image as label

---
(limited to 'TurtleArt')

diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py
index b39ceaa..9432626 100644
--- a/TurtleArt/tablock.py
+++ b/TurtleArt/tablock.py
@@ -25,7 +25,7 @@ import cairo
 from taconstants import (EXPANDABLE, EXPANDABLE_ARGS, OLD_NAMES, CONSTANTS,
                          STANDARD_STROKE_WIDTH, BLOCK_SCALE, BOX_COLORS,
                          GRADIENT_COLOR, EXPANDABLE_FLOW, Color,
-                         MEDIA_BLOCK2TYPE)
+                         MEDIA_BLOCK2TYPE, BLOCKS_WITH_SKIN)
 from tapalette import (palette_blocks, block_colors, expandable_blocks,
                        content_blocks, block_names, block_primitives,
                        block_styles, special_block_colors)
@@ -698,7 +698,7 @@ class Block:
 
 
     def _set_labels(self, i, label):
-        if self.spr is None:
+        if self.spr is None or self.name in BLOCKS_WITH_SKIN:
             return
         self.spr.set_label(label, i)
 
--
cgit v0.9.1