Merge remote-tracking branch 'upstream/master'

Author: targos

Diff for: src/main/java/com/actelion/research/chem/descriptor/flexophore/FlexophoreAtomContributionColors.java

@@ -117,7 +117,7 @@ public float[] getRefRadius() {
 		return mRefRadius;
 	}
 
-	private int[] createDiverseColorList(int colorCount) {
+	public static int[] createDiverseColorList(int colorCount) {
 		if (colorCount <= cDiverseColor.length)
 			return cDiverseColor;
 

Diff for: src/main/java/com/actelion/research/gui/editor/GenericEditorArea.java

@@ -592,10 +592,11 @@ public void toolChanged(int newTool) {
 		if (mCurrentTool != newTool) {
 			if (mCurrentTool == GenericEditorToolbar.cToolMapper
 					|| newTool == GenericEditorToolbar.cToolMapper) {
+				mCurrentTool = newTool;
 				update(UPDATE_REDRAW);
+			} else {
+				mCurrentTool = newTool;
 			}
-
-			mCurrentTool = newTool;
 		}
 	}