wip upstream merge

This commit is contained in:
Jesse Boyd
2019-04-04 00:25:16 +11:00
parent 7086eb8b3e
commit 8897109dc4
52 changed files with 236 additions and 209 deletions

View File

@ -1409,23 +1409,23 @@ public class LocalSession implements TextureHolder {
this.fastMode = fastMode;
}
/**
* Gets the reorder mode of the session.
*
* @return The reorder mode
*/
public EditSession.ReorderMode getReorderMode() {
return reorderMode;
}
/**
* Sets the reorder mode of the session.
*
* @param reorderMode The reorder mode
*/
public void setReorderMode(EditSession.ReorderMode reorderMode) {
this.reorderMode = reorderMode;
}
// /**
// * Gets the reorder mode of the session.
// *
// * @return The reorder mode
// */
// public EditSession.ReorderMode getReorderMode() {
// return reorderMode;
// }
//
// /**
// * Sets the reorder mode of the session.
// *
// * @param reorderMode The reorder mode
// */
// public void setReorderMode(EditSession.ReorderMode reorderMode) {
// this.reorderMode = reorderMode;
// }
/**
* Get the mask.