← Back to branch summary

~mapeditor.org/tiled/snapshot

« back to all changes in this revision

Viewing changes to src/tiled/stampbrush.cpp

  • Committer: Thorbjørn Lindeijer
  • Date: 2011-02-27 21:52:31 UTC
  • mfrom: (563.1.18)
  • Revision ID: git-v1:5c6e0769d046023af8cb37b93fd9dc163558b24d
Merge branch '0.6'

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tiled/stampbrush.cpp
281
281
            stamp->merge(p, mStamp);
282
282
        }
283
283
    }
 
284
 
284
285
    brushItem()->setTileLayer(stamp);
 
286
    delete stamp;
285
287
}
286
288
 
287
289
void StampBrush::modifiersChanged(Qt::KeyboardModifiers modifiers)
431
433
        brushItem()->setTileLayerPosition(QPoint(mStampX, mStampY));
432
434
    } else {
433
435
        brushItem()->setTileRegion(QRect(tilePos, QSize(1, 1)));
 
436
        mStampX = tilePos.x();
 
437
        mStampY = tilePos.y();
434
438
    }
435
439
}