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

10 years ago · c560f8b8a2
parent 89c2a7e26b 650e37dba1
commit c560f8b8a2
1 changed files with 3 additions and 3 deletions
--- a/apps/opencs/model/world/regionmap.cpp
+++ b/apps/opencs/model/world/regionmap.cpp
@ -334,9 +334,9 @@ QVariant CSMWorld::RegionMap::data (const QModelIndex& index, int role) const
                mColours.find (Misc::StringUtils::lowerCase (cell->second.mRegion));

            if (iter!=mColours.end())
-                return QBrush (
-                    QColor (iter->second>>24, (iter->second>>16) & 255, (iter->second>>8) & 255,
-                    iter->second & 255));
+                return QBrush (QColor (iter->second & 0xff, 
+                                       (iter->second >> 8) & 0xff, 
+                                       (iter->second >> 16) & 0xff));

            if (cell->second.mRegion.empty())
                return QBrush (Qt::Dense6Pattern); // no region