Merge branch 'nocolladacorruption' into 'master'

[OpenMW-CS] Fix corrupted rendering of collada-models

See merge request OpenMW/openmw!549

CHANGELOG.md

@@ -87,6 +87,7 @@
     Bug #5695: ExplodeSpell for actors doesn't target the ground
     Bug #5703: OpenMW-CS menu system crashing on XFCE
     Bug #5706: AI sequences stop looping after the saved game is reloaded
+    Bug #5713: OpenMW-CS: Collada models are corrupted in Qt-based scene view
     Bug #5731: Editor: skirts are invisible on characters
     Bug #5739: Saving and loading the save a second or two before hitting the ground doesn't count fall damage
     Bug #5758: Paralyzed actors behavior is inconsistent with vanilla

CHANGELOG_PR.md

@@ -39,6 +39,7 @@ Editor Bug Fixes:
 - Verifier no longer checks for alleged 'race' entries in clothing body parts (#5400)
 - Loading mods now keeps the master index (#5675)
 - Flicker and crashing on XFCE4 fixed (#5703)
+- Collada models render properly in the Editor (#5713)
 
 Miscellaneous:
 - Prevent save-game bloating by using an appropriate fog texture format (#5108)

apps/opencs/main.cpp

@@ -63,6 +63,9 @@ int runApplication(int argc, char *argv[])
     application.setWindowIcon (QIcon (":./openmw-cs.png"));
 
     CS::Editor editor(argc, argv);
+#ifdef __linux__
+    setlocale(LC_NUMERIC,"C");
+#endif
 
     if(!editor.makeIPCServer())
     {

apps/opencs/model/world/resourcesmanager.cpp

@@ -17,7 +17,7 @@ void CSMWorld::ResourcesManager::addResources (const Resources& resources)
 const char * const * CSMWorld::ResourcesManager::getMeshExtensions()
 {
     // maybe we could go over the osgDB::Registry to list all supported node formats
-    static const char * const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", 0 };
+    static const char * const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", "dae", 0 };
     return sMeshTypes;
 }