diff -Nru fgrun-3.3.0~706+git03249fe/debian/changelog fgrun-3.3.0~707+gite145a08/debian/changelog --- fgrun-3.3.0~706+git03249fe/debian/changelog 2014-08-16 04:00:20.000000000 +0000 +++ fgrun-3.3.0~707+gite145a08/debian/changelog 2014-08-25 22:00:27.000000000 +0000 @@ -1,3 +1,12 @@ +fgrun (3.3.0~707+gite145a08-0ubuntu1~ppa1~trusty1) trusty; urgency=low + + [ Clément de l'Hamaide ] + * Remove --enable/disable-texture option + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Mon, 25 Aug 2014 18:00:26 -0400 + fgrun (3.3.0~706+git03249fe-0ubuntu1~ppa1~trusty1) trusty; urgency=low [ Clément de l'Hamaide ] diff -Nru fgrun-3.3.0~706+git03249fe/po/de.po fgrun-3.3.0~707+gite145a08/po/de.po --- fgrun-3.3.0~706+git03249fe/po/de.po 2014-06-22 14:11:36.000000000 +0000 +++ fgrun-3.3.0~707+gite145a08/po/de.po 2014-08-25 22:00:04.000000000 +0000 @@ -13,10 +13,10 @@ "PO-Revision-Date: 2008-01-30 16:00+0100\n" "Last-Translator: Adrian \n" "Language-Team: German\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP1252\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/logwin.cxx:34 @@ -450,10 +450,6 @@ msgid "Enable specular reflections on textured objects" msgstr "Glanz auf texturierten Objekten An" -#: src/advanced.cxx:1098 -msgid "Enable textures" -msgstr "Texturen An" - #: src/advanced.cxx:789 msgid "Enable the instrument panel" msgstr "Instrumentenpanel anzeigen" diff -Nru fgrun-3.3.0~706+git03249fe/po/es.po fgrun-3.3.0~707+gite145a08/po/es.po --- fgrun-3.3.0~706+git03249fe/po/es.po 2014-06-22 14:11:36.000000000 +0000 +++ fgrun-3.3.0~707+gite145a08/po/es.po 2014-08-25 22:00:04.000000000 +0000 @@ -13,10 +13,10 @@ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP1252\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" #: src/logwin.cxx:34 msgid "&Close" @@ -454,10 +454,6 @@ msgid "Enable specular reflections on textured objects" msgstr "Activa un brillo especular sobre el suelo y otros objetos" -#: src/advanced.cxx:1098 -msgid "Enable textures" -msgstr "Activar texturas" - #: src/advanced.cxx:789 msgid "Enable the instrument panel" msgstr "Activa el panel 2D" diff -Nru fgrun-3.3.0~706+git03249fe/po/fgrun.pot fgrun-3.3.0~707+gite145a08/po/fgrun.pot --- fgrun-3.3.0~706+git03249fe/po/fgrun.pot 2014-06-22 14:11:36.000000000 +0000 +++ fgrun-3.3.0~707+gite145a08/po/fgrun.pot 2014-08-25 22:00:04.000000000 +0000 @@ -444,10 +444,6 @@ msgid "Textures" msgstr "" -#: src/advanced.cxx:1098 -msgid "Enable textures" -msgstr "" - #: src/advanced.cxx:1103 msgid "Wireframe" msgstr "" diff -Nru fgrun-3.3.0~706+git03249fe/po/fr.po fgrun-3.3.0~707+gite145a08/po/fr.po --- fgrun-3.3.0~706+git03249fe/po/fr.po 2014-06-22 14:11:36.000000000 +0000 +++ fgrun-3.3.0~707+gite145a08/po/fr.po 2014-08-25 22:00:04.000000000 +0000 @@ -12,10 +12,10 @@ "PO-Revision-Date: 2008-01-05 19:05+0100\n" "Last-Translator: \n" "Language-Team: French\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP1252\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: src/logwin.cxx:34 @@ -451,10 +451,6 @@ msgid "Enable specular reflections on textured objects" msgstr "Enclencher les reflets spculaires sur les objets texturs" -#: src/advanced.cxx:1098 -msgid "Enable textures" -msgstr "Enclencher les textures" - #: src/advanced.cxx:789 msgid "Enable the instrument panel" msgstr "Enclencher le tableau de bord" diff -Nru fgrun-3.3.0~706+git03249fe/po/it.po fgrun-3.3.0~707+gite145a08/po/it.po --- fgrun-3.3.0~706+git03249fe/po/it.po 2014-06-22 14:11:36.000000000 +0000 +++ fgrun-3.3.0~707+gite145a08/po/it.po 2014-08-25 22:00:04.000000000 +0000 @@ -11,10 +11,10 @@ "PO-Revision-Date: 2008-02-05 00:02+0100\n" "Last-Translator: Andrea Vezzali \n" "Language-Team: Italian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/logwin.cxx:34 @@ -454,10 +454,6 @@ msgid "Enable specular reflections on textured objects" msgstr "Abilita riflessione speculare sugli oggetti testurizzati" -#: src/advanced.cxx:1098 -msgid "Enable textures" -msgstr "Abilita Textures" - #: src/advanced.cxx:789 msgid "Enable the instrument panel" msgstr "Abilita pannello strumenti" diff -Nru fgrun-3.3.0~706+git03249fe/po/ja.po fgrun-3.3.0~707+gite145a08/po/ja.po --- fgrun-3.3.0~706+git03249fe/po/ja.po 2014-06-22 14:11:36.000000000 +0000 +++ fgrun-3.3.0~707+gite145a08/po/ja.po 2014-08-25 22:00:04.000000000 +0000 @@ -10,10 +10,10 @@ "PO-Revision-Date: 2013-05-27 22:25+0900\n" "Last-Translator: AOKI kiyohito \n" "Language-Team: FlightGear.jpn.org\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Virtaal 0.7.1\n" @@ -451,10 +451,6 @@ msgid "Enable specular reflections on textured objects" msgstr "テクスチャが貼られたオブジェクトの光の反射を有効にします" -#: src/advanced.cxx:1098 -msgid "Enable textures" -msgstr "テクスチャを有効にします" - #: src/advanced.cxx:789 msgid "Enable the instrument panel" msgstr "計器パネルを有効にします" diff -Nru fgrun-3.3.0~706+git03249fe/po/nl.po fgrun-3.3.0~707+gite145a08/po/nl.po --- fgrun-3.3.0~706+git03249fe/po/nl.po 2014-06-22 14:11:36.000000000 +0000 +++ fgrun-3.3.0~707+gite145a08/po/nl.po 2014-08-25 22:00:04.000000000 +0000 @@ -12,10 +12,10 @@ "PO-Revision-Date: 2010-05-23 18:36+0200\n" "Last-Translator: Gijs de Rooy \n" "Language-Team: Dutch\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP1252\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/logwin.cxx:34 @@ -469,10 +469,6 @@ msgid "Enable specular reflections on textured objects" msgstr "Schakel glimmende weerkaatsingen in op getextureerde objecten" -#: src/advanced.cxx:1098 -msgid "Enable textures" -msgstr "Schakel textures in" - #: src/advanced.cxx:789 msgid "Enable the instrument panel" msgstr "Schakel het instrumenten paneel aan" diff -Nru fgrun-3.3.0~706+git03249fe/po/pl.po fgrun-3.3.0~707+gite145a08/po/pl.po --- fgrun-3.3.0~706+git03249fe/po/pl.po 2014-06-22 14:11:36.000000000 +0000 +++ fgrun-3.3.0~707+gite145a08/po/pl.po 2014-08-25 22:00:04.000000000 +0000 @@ -11,10 +11,10 @@ "PO-Revision-Date: 2008-12-15 22:12+0100\n" "Last-Translator: \n" "Language-Team: Polish\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ASCII\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -468,10 +468,6 @@ msgid "Enable specular reflections on textured objects" msgstr "Wlacz blyszczenie teksturowanych obiektow" -#: src/advanced.cxx:1098 -msgid "Enable textures" -msgstr "Wlacz tekstury" - #: src/advanced.cxx:789 msgid "Enable the instrument panel" msgstr "Wlacz panel przyrzadow" diff -Nru fgrun-3.3.0~706+git03249fe/po/pt.po fgrun-3.3.0~707+gite145a08/po/pt.po --- fgrun-3.3.0~706+git03249fe/po/pt.po 2014-06-22 14:11:36.000000000 +0000 +++ fgrun-3.3.0~707+gite145a08/po/pt.po 2014-08-25 22:00:04.000000000 +0000 @@ -12,10 +12,10 @@ "PO-Revision-Date: 2012-02-27 14:27-0300\n" "Last-Translator: Lizandro \n" "Language-Team: Portuguese \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: BRAZIL\n" @@ -458,10 +458,6 @@ msgid "Enable specular reflections on textured objects" msgstr "Ativar reflexões especulares sobre objetos texturizados" -#: src/advanced.cxx:1098 -msgid "Enable textures" -msgstr "Habilitar texturas" - #: src/advanced.cxx:789 msgid "Enable the instrument panel" msgstr "Habilitar o painel de instrumentos" diff -Nru fgrun-3.3.0~706+git03249fe/src/advanced.fl fgrun-3.3.0~707+gite145a08/src/advanced.fl --- fgrun-3.3.0~706+git03249fe/src/advanced.fl 2014-06-22 14:11:36.000000000 +0000 +++ fgrun-3.3.0~707+gite145a08/src/advanced.fl 2014-08-25 22:00:04.000000000 +0000 @@ -424,13 +424,9 @@ label {Texture compression} private tooltip {Disabling texture compression can solve the bug where terrain is black} xywh {180 130 120 25} down_box DOWN_BOX value 1 labelsize 12 } - Fl_Check_Button textures { - label Textures - private tooltip {Enable textures} xywh {180 160 120 25} down_box DOWN_BOX value 1 labelsize 12 - } Fl_Check_Button wireframe { label Wireframe - private tooltip {Enable wireframe drawing mode} xywh {180 190 120 25} down_box DOWN_BOX labelsize 12 + private tooltip {Enable wireframe drawing mode} xywh {180 160 120 25} down_box DOWN_BOX labelsize 12 } Fl_Check_Button rembrandt { label Rembrandt @@ -439,7 +435,7 @@ } else { anti_aliasing->activate(); }} - private tooltip {Enable project Rembrandt (deferred rendering)} xywh {180 220 120 25} down_box DOWN_BOX labelsize 12 + private tooltip {Enable project Rembrandt (deferred rendering)} xywh {180 190 120 25} down_box DOWN_BOX labelsize 12 } Fl_Group {} { label Shading diff -Nru fgrun-3.3.0~706+git03249fe/src/fgfsrc.cxx fgrun-3.3.0~707+gite145a08/src/fgfsrc.cxx --- fgrun-3.3.0~706+git03249fe/src/fgfsrc.cxx 2014-06-22 14:11:36.000000000 +0000 +++ fgrun-3.3.0~707+gite145a08/src/fgfsrc.cxx 2014-08-25 22:00:04.000000000 +0000 @@ -273,8 +273,6 @@ os << pfx << "--enable-fullscreen"; if (prefs.get( "texture_compression", iVal, 1 ) && !iVal) os << pfx << "--prop:/sim/rendering/texture-compression=off"; - if (prefs.get( "textures", iVal, 1 ) && !iVal) - os << pfx << "--disable-textures"; if (prefs.get( "wireframe", iVal, 0 ) && iVal) os << pfx << "--enable-wireframe"; if (prefs.get( "shading", buf, "", buflen-1 ) && diff -Nru fgrun-3.3.0~706+git03249fe/src/settings.cxx fgrun-3.3.0~707+gite145a08/src/settings.cxx --- fgrun-3.3.0~706+git03249fe/src/settings.cxx 2014-06-22 14:11:36.000000000 +0000 +++ fgrun-3.3.0~707+gite145a08/src/settings.cxx 2014-08-25 22:00:04.000000000 +0000 @@ -136,7 +136,6 @@ prefs.set("clouds3d", clouds3d->value()); prefs.set("fullscreen", fullscreen->value()); prefs.set("texture_compression", texture_compression->value()); - prefs.set("textures", textures->value()); prefs.set("wireframe", wireframe->value()); prefs.set("rembrandt", rembrandt->value()); if (fog_disabled->value()) @@ -430,8 +429,6 @@ fullscreen->value(iVal); prefs.get("texture_compression", iVal, 1); texture_compression->value(iVal); - prefs.get("textures", iVal, 1); - textures->value(iVal); prefs.get("wireframe", iVal, 0); wireframe->value(iVal); prefs.get("rembrandt", iVal, 0); @@ -713,7 +710,6 @@ prefs.deleteEntry("clouds3d" ); prefs.deleteEntry("fullscreen" ); prefs.deleteEntry("texture_compression" ); - prefs.deleteEntry("textures" ); prefs.deleteEntry("wireframe" ); prefs.deleteEntry("rembrandt" ); prefs.deleteEntry("fog" );