Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
targos committed Jul 25, 2024
2 parents 4da0fb7 + e8e44d2 commit b52c78d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down

0 comments on commit b52c78d

Please sign in to comment.