Merge lp:~cern-kicad/kicad/bugfix_1265354 into lp:kicad/product

[Maciej Suminski]

=== modified file 'pcbnew/class_text_mod.cpp'
--- pcbnew/class_text_mod.cpp	2013-12-20 09:15:00 +0000
+++ pcbnew/class_text_mod.cpp	2014-02-03 07:59:14 +0000
@@ -417,28 +417,35 @@
 
 void TEXTE_MODULE::ViewGetLayers( int aLayers[], int& aCount ) const
 {
-    switch( m_Type )
-    {
-    case TEXT_is_REFERENCE:
-        aLayers[0] = ITEM_GAL_LAYER( MOD_REFERENCES_VISIBLE );
-        break;
-
-    case TEXT_is_VALUE:
-        aLayers[0] = ITEM_GAL_LAYER( MOD_VALUES_VISIBLE );
-        break;
-
-    default:
-        switch( GetParent()->GetLayer() )
+    if( m_NoShow )      // Hidden text
+    {
+        aLayers[0] = ITEM_GAL_LAYER( MOD_TEXT_INVISIBLE );
+    }
+    else
+    {
+        switch( m_Type )
         {
-        case LAYER_N_BACK:
-            aLayers[0] = ITEM_GAL_LAYER( MOD_TEXT_BK_VISIBLE );    // how about SILKSCREEN_N_BACK?
-            break;
-
-        case LAYER_N_FRONT:
-            aLayers[0] = ITEM_GAL_LAYER( MOD_TEXT_FR_VISIBLE );    // how about SILKSCREEN_N_FRONT?
+        case TEXT_is_REFERENCE:
+            aLayers[0] = ITEM_GAL_LAYER( MOD_REFERENCES_VISIBLE );
+            break;
+
+        case TEXT_is_VALUE:
+            aLayers[0] = ITEM_GAL_LAYER( MOD_VALUES_VISIBLE );
+            break;
+
+        default:
+            switch( GetParent()->GetLayer() )
+            {
+            case LAYER_N_BACK:
+                aLayers[0] = ITEM_GAL_LAYER( MOD_TEXT_BK_VISIBLE );    // how about SILKSCREEN_N_BACK?
+                break;
+
+            case LAYER_N_FRONT:
+                aLayers[0] = ITEM_GAL_LAYER( MOD_TEXT_FR_VISIBLE );    // how about SILKSCREEN_N_FRONT?
+                break;
+            }
             break;
         }
-        break;
     }
 
     aCount = 1;

=== modified file 'pcbnew/ratsnest_data.cpp'
--- pcbnew/ratsnest_data.cpp	2013-12-20 14:18:41 +0000
+++ pcbnew/ratsnest_data.cpp	2014-02-03 07:59:14 +0000
@@ -240,7 +240,7 @@
 
         return;
     }
-    else if( boardNodes.size() == 1 )   // This case is even simpler
+    else if( boardNodes.size() <= 1 )   // This case is even simpler
     {
         m_rnEdges.reset( new std::vector<RN_EDGE_PTR>( 0 ) );