Add missing change from resolution of merge
Missed a change resolving merges for PhotoPanel.java Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
This commit is contained in:
parent
c95d7df327
commit
31f52cec18
@ -116,6 +116,16 @@ public class PhotoPanel extends JPanel implements GLEventListener {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void clearDoc() {
|
||||||
|
document.removeDocumentChangeListener(changeListener);
|
||||||
|
changeListener = null;
|
||||||
|
document = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
PhotoSettings getSettings() {
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
PhotoPanel(OpenRocketDocument document, PhotoSettings p) {
|
PhotoPanel(OpenRocketDocument document, PhotoSettings p) {
|
||||||
this.p = p;
|
this.p = p;
|
||||||
this.setLayout(new BorderLayout());
|
this.setLayout(new BorderLayout());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user