diff options
| author |  rcoh <rcoh@mit.edu> | 2011-01-04 10:47:46 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2011-01-04 10:47:46 -0500 |
| commit | 5b90941441be6ef6c945f7bdf3489db65aff90ee (patch) | |
| tree | f8c8bb45a584d1b7ee7c84fc8b4033a097039f00 /operationscore | |
| parent | dcc7afcea31c968575446b7f215d6780f747d7fb (diff) | |
| parent | 69449f1991952cee28c597f1a2bbb3f927751447 (diff) | |
Merge branch 'performance'
Conflicts:
config/Outdoor.xml
util/ColorOps.py
Diffstat (limited to 'operationscore')
| -rw-r--r-- | operationscore/PixelEvent.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/operationscore/PixelEvent.py b/operationscore/PixelEvent.py index e2b852a..6b0812f 100644 --- a/operationscore/PixelEvent.py +++ b/operationscore/PixelEvent.py @@ -11,6 +11,8 @@ class PixelEvent(SmootCoreObject): pass #Returns a new PixelEvent, but with a response scaled by c. def scale(self,c): + if c == 1: + return self newDict = dict(self.argDict) newDict['Color'] = color.multiplyColor(newDict['Color'], c) return self.__class__(newDict) |