AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix transformed inputs not using the correct bounds when overlapping

Browse Source
This commit is contained in:
David Vierra 2016-05-12 21:03:38 -10:00
parent a2a660a1c8
commit 8987e33feb
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mcedit2/imports.py
View File

@ -416,6 +416,11 @@ class PendingImport(QtCore.QObject):
return self.sourceDim return self.sourceDim
def getSourceForDim(self, destDim): def getSourceForDim(self, destDim):
if self.transformedDim is not None:
selection = self.transformedDim.bounds
else:
selection = self.selection
if destDim is self.sourceDim: if destDim is self.sourceDim:
sourceDim = self.importDim sourceDim = self.importDim
destBox = self.importBounds destBox = self.importBounds
@ -427,16 +432,12 @@ class PendingImport(QtCore.QObject):
# Use intermediate schematic only if source and destination overlap. # Use intermediate schematic only if source and destination overlap.
if sourceBounds.intersect(destBox).volume: if sourceBounds.intersect(destBox).volume:
log.info("Move: using temporary") log.info("Move: using temporary")
export = extractSchematicFromIter(sourceDim, self.selection) export = extractSchematicFromIter(sourceDim, selection)
schematic = showProgress(self.tr("Copying..."), export) schematic = showProgress(self.tr("Copying..."), export)
tempDim = schematic.getDimension() tempDim = schematic.getDimension()
return tempDim, tempDim.bounds return tempDim, tempDim.bounds
# Use source as-is # Use source as-is
if self.transformedDim is not None:
selection = self.transformedDim.bounds
else:
selection = self.selection
return self.importDim, selection return self.importDim, selection
@property @property