Merge remote-tracking branch 'smbas/fix-regionmap-colors'

c++11
Marc Zinnschlag 10 years ago
commit c560f8b8a2

@ -334,9 +334,9 @@ QVariant CSMWorld::RegionMap::data (const QModelIndex& index, int role) const
mColours.find (Misc::StringUtils::lowerCase (cell->second.mRegion)); mColours.find (Misc::StringUtils::lowerCase (cell->second.mRegion));
if (iter!=mColours.end()) if (iter!=mColours.end())
return QBrush ( return QBrush (QColor (iter->second & 0xff,
QColor (iter->second>>24, (iter->second>>16) & 255, (iter->second>>8) & 255, (iter->second >> 8) & 0xff,
iter->second & 255)); (iter->second >> 16) & 0xff));
if (cell->second.mRegion.empty()) if (cell->second.mRegion.empty())
return QBrush (Qt::Dense6Pattern); // no region return QBrush (Qt::Dense6Pattern); // no region

Loading…
Cancel
Save