Replaced Shape by MShape to avoid name conflicts.

This commit is contained in:
Tats
2014-10-31 17:03:18 -04:00
parent 8c3a66344a
commit e8870db92a
16 changed files with 66 additions and 66 deletions

View File

@@ -22,7 +22,7 @@
UidAllocator Mapping::allocator;
Mapping::Mapping(Paint::ptr paint, Shape::ptr shape, uid id)
Mapping::Mapping(Paint::ptr paint, MShape::ptr shape, uid id)
: _paint(paint), _shape(shape),
_isLocked(false), _isSolo(false), _isVisible(true), _opacity(1.0f)
{