diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-07-26 16:14:46 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-07-26 16:14:46 -0500 |
| commit | 9aae6f2aac200d11b9f1cc90d745ffe68b735e3a (patch) | |
| tree | 971fad763ad7e74ac75e05ced9e282142304fb73 /src | |
| parent | dcd8c9c20aa883d056862d0ba7c53fd7b06edc49 (diff) | |
| download | koopatlas-9aae6f2aac200d11b9f1cc90d745ffe68b735e3a.tar.gz koopatlas-9aae6f2aac200d11b9f1cc90d745ffe68b735e3a.zip | |
fixed a doodad release on multi-edit bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/editorui/doodads.py | 1 | ||||
| -rw-r--r-- | src/mapdata.py | 6 | ||||
| -rw-r--r-- | src/ui.py | 9 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/editorui/doodads.py b/src/editorui/doodads.py index 068c420..bdba4d4 100644 --- a/src/editorui/doodads.py +++ b/src/editorui/doodads.py @@ -55,7 +55,6 @@ class KPEditorDoodad(KPEditorItem): print thong print type(thong) - def setEditorData(self, editor, index): diff --git a/src/mapdata.py b/src/mapdata.py index d175046..5d46685 100644 --- a/src/mapdata.py +++ b/src/mapdata.py @@ -334,8 +334,12 @@ class KPDoodad(object): self.offsetTimer.start() def startTimeline(self): + if QtCore.QTimeLine.state(self) == 0: + QtCore.QTimeLine.start(self) + else: + QtCore.QTimeLine.stop(self) + QtCore.QTimeLine.start(self) - QtCore.QTimeLine.start(self) def cleanUpAnimations(self): myTimelines = self.timelines @@ -988,10 +988,11 @@ class KPAnmOptions(QtGui.QWidget): anmList.append(rowList) for doodad in self.doodadList: - d = doodad() + if doodad() != None: + d = doodad() - d.animations = anmList - d.setupAnimations() + d.animations = anmList + d.setupAnimations() model.clear() self.model.setHorizontalHeaderLabels(["Looping", "Interpolation", "Frame Len", "Type", "Start Value", "End Value", "Delay", "Delay Offset"]) @@ -1365,7 +1366,7 @@ class KPMainWindow(QtGui.QMainWindow): fn = unicode(fn) for d in KP.map.doodadDefinitions: - d[1].save(fn + d[0] + '.png', 'PNG') + d[1].save(fn + '/' + d[0] + '.png', 'PNG') def batchSave(self): |