Merge pull request #153 from davidB/fix_152

SDK: fix #152 SceneComposer/SceneViewer bug in open/close Scene
This commit is contained in:
normen 2014-06-12 14:12:57 +02:00
commit 87cac884ad

View File

@ -864,6 +864,7 @@ private void jToggleSelectGeomActionPerformed(java.awt.event.ActionEvent evt) {/
sceneInfoLabel2.setToolTipText(""); sceneInfoLabel2.setToolTipText("");
close(); close();
} else { } else {
result.addLookupListener(this);
showSelectionToggleButton.setSelected(true); showSelectionToggleButton.setSelected(true);
showGridToggleButton.setSelected(false); showGridToggleButton.setSelected(false);
//TODO: threading //TODO: threading
@ -881,7 +882,6 @@ private void jToggleSelectGeomActionPerformed(java.awt.event.ActionEvent evt) {/
public void openScene(Spatial spat, AssetDataObject file, ProjectAssetManager manager) { public void openScene(Spatial spat, AssetDataObject file, ProjectAssetManager manager) {
cleanupControllers(); cleanupControllers();
SceneApplication.getApplication().addSceneListener(this); SceneApplication.getApplication().addSceneListener(this);
result.addLookupListener(this);
Node node; Node node;
if (spat instanceof Node) { if (spat instanceof Node) {
node = (Node) spat; node = (Node) spat;