Merge remote-tracking branch 'smbas/master'

apps/opencs/model/world/data.cpp

@@ -479,6 +479,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
 
     mMetaData.addColumn (new StringIdColumn<MetaData> (true));
     mMetaData.addColumn (new RecordStateColumn<MetaData>);
+    mMetaData.addColumn (new FixedRecordTypeColumn<MetaData> (UniversalId::Type_MetaData));
     mMetaData.addColumn (new FormatColumn<MetaData>);
     mMetaData.addColumn (new AuthorColumn<MetaData>);
     mMetaData.addColumn (new FileDescriptionColumn<MetaData>);

apps/opencs/view/world/dragrecordtable.cpp

@@ -55,12 +55,10 @@ void CSVWorld::DragRecordTable::dragMoveEvent(QDragMoveEvent *event)
         if (index.flags() & Qt::ItemIsEditable)
         {
             event->accept();
+            return;
         }
     }
-    else
-    {
-        event->ignore();
-    }
+    event->ignore();
 }
 
 void CSVWorld::DragRecordTable::dropEvent(QDropEvent *event)