From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 19 Feb 2019 12:01:15 +0000 (+0000)
Subject: Merge branch 'feature/JAL-3187linkedFeatures' into
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fmerge%2FJAL-3187_JAL-3010;p=jalview.git

Merge branch 'feature/JAL-3187linkedFeatures' into
merge/JAL-3187_JAL-3010

Conflicts:
	src/jalview/gui/FeatureSettings.java
	src/jalview/renderer/seqfeatures/FeatureRenderer.java
---

834b2f0f7bee2c61ab68b285d5e81ff94b425400
diff --cc src/jalview/gui/FeatureSettings.java
index 495cde6,47c0cc5..058de9c
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@@ -210,9 -201,8 +214,10 @@@ public class FeatureSettings extends JP
      transparency.setMaximum(100 - originalTransparencyAsPercent);
  
      originalFilters = new HashMap<>(fr.getFeatureFilters()); // shallow copy
+     originalViewStyle = new ViewStyle(af.viewport.getViewStyle());
  
 +    topLevelTypes = new ArrayList<>();
 +
      try
      {
        jbInit();