From: Simon Cross Date: Fri, 9 Sep 2016 20:21:11 +0000 (+0200) Subject: Merge branch 'master' of ctpug.org.za:tabakrolletjie X-Git-Tag: tabakrolletjie-v1.0.0~152 X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=c30f1093315596a321a5abe26a9ecfd254d54c2a;hp=68bffb19c42c6b325c75f11b83405701ce9ea761;p=tabakrolletjie.git Merge branch 'master' of ctpug.org.za:tabakrolletjie --- diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py index f0ec535..f1a69d6 100644 --- a/tabakrolletjie/lights.py +++ b/tabakrolletjie/lights.py @@ -203,7 +203,7 @@ class BaseLight(object): def get_image(self): if self._image is None: - self._image = loader.load_image("64", self.FITTING).copy() + self._image = loader.load_image("64", self.FITTING_IMG).copy() fitting_colour = self.COLOURS[self.colour] self._image.fill(fitting_colour, None, pgl.BLEND_RGBA_MULT) return self._image @@ -217,7 +217,7 @@ class BaseLight(object): class SpotLight(BaseLight): - FITTING = "spotlight.png" + FITTING_IMG = "spotlight.png" def __init__(self, **kw): kw.pop("direction", None)