Correctly merge icon and light beam appearances

diff --git a/source/appearance.cpp b/source/appearance.cpp
index cb132fd135a96c0effdaee80d274b331006e0a70..51ff10d36e1e99596198911dc7f039f66916243c 100644 (file)
--- a/source/appearance.cpp
+++ b/source/appearance.cpp
@@ -33,6 +33,18 @@ void Appearance::merge_from(const Appearance &other)
                sound_type = other.sound_type;
                sound_volume = other.sound_volume;
        }
                sound_type = other.sound_type;
                sound_volume = other.sound_volume;
        }

+       if(other.show_icon)
+       {
+               show_icon = true;
+               icon_shape = other.icon_shape;
+               icon_color = other.icon_color;
+               icon_size = other.icon_size;
+       }
+       if(other.show_beam)
+       {
+               show_beam = true;
+               beam_color = other.beam_color;
+       }

 }
 
 void Appearance::add_lines(FilterStatement &st) const
 }
 
 void Appearance::add_lines(FilterStatement &st) const