Merge branch 'master' of git@github.com:pixhawk/qgroundcontrol

src/comm/MAVLinkXMLParser.cc

@@ -443,10 +443,10 @@ bool MAVLinkXMLParser::generate()
     rawHeader.write(mainHeader.toLatin1());
 
     // Write C structs / lcm definitions
-    QFile lcmStructs(outputDirName + "/mavlink.lcm");
-    ok = lcmStructs.open(QIODevice::WriteOnly | QIODevice::Text);
-    success = success && ok;
-    lcmStructs.write(lcmStructDefs.toLatin1());
+//    QFile lcmStructs(outputDirName + "/mavlink.lcm");
+//    ok = lcmStructs.open(QIODevice::WriteOnly | QIODevice::Text);
+//    success = success && ok;
+//    lcmStructs.write(lcmStructDefs.toLatin1());
 
     return success;
 }

src/ui/map3D/Q3DWidget.cc

@@ -495,6 +495,7 @@ Q3DWidget::initializeGL(void)
 
     glEnable(GL_DEPTH_TEST);
     glShadeModel(GL_SMOOTH);
+
     glLightfv(GL_LIGHT0, GL_AMBIENT, lightAmbient);
     glLightfv(GL_LIGHT0, GL_DIFFUSE, lightDiffuse);
     glLightfv(GL_LIGHT0, GL_SPECULAR, lightSpecular);