eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-advanced-mapping-list' into develop-try-to-merge-with-adv

Browse Source 
# Conflicts:
#	MainWindow.cpp
This commit is contained in:
Tats
2016-03-05 22:41:41 -05:00
parent 9644b636be 7cc1043368
commit 3d58c92e97
25 changed files with 869 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mapping.cpp
+8
View File
@@ -72,6 +72,14 @@ void Mapping::setDepth(int depth)
}
}
void Mapping::setLocked(bool locked)
{
_shape->setLocked(locked);
if (hasInputShape())
_inputShape->setLocked(locked);
Element::setLocked(locked);
}
void Mapping::read(const QDomElement& obj)
{