Upstream merged.

pcbnew/class_text_mod.cpp

@@ -429,28 +429,35 @@ const BOX2I TEXTE_MODULE::ViewBBox() const
 
 void TEXTE_MODULE::ViewGetLayers( int aLayers[], int& aCount ) const
 {
-    switch( m_Type )
+    if( m_NoShow )      // Hidden text
     {
-    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() )
+        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?
+        case TEXT_is_REFERENCE:
+            aLayers[0] = ITEM_GAL_LAYER( MOD_REFERENCES_VISIBLE );
             break;
 
-        case LAYER_N_FRONT:
-            aLayers[0] = ITEM_GAL_LAYER( MOD_TEXT_FR_VISIBLE );    // how about SILKSCREEN_N_FRONT?
+        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;