Merge pull request #7014 from huffman/disable-edit-grid

Disable gridTool in edit.js
This commit is contained in:
James B. Pollack 2016-02-02 11:44:46 -08:00
commit 43bf7cf679

View file

@ -39,10 +39,10 @@ var lightOverlayManager = new LightOverlayManager();
var cameraManager = new CameraManager(); var cameraManager = new CameraManager();
var grid = Grid(); var grid = Grid();
gridTool = GridTool({ // gridTool = GridTool({
horizontalGrid: grid // horizontalGrid: grid
}); // });
gridTool.setVisible(false); // gridTool.setVisible(false);
var entityListTool = EntityListTool(); var entityListTool = EntityListTool();
@ -336,7 +336,7 @@ var toolBar = (function() {
isActive = active; isActive = active;
if (!isActive) { if (!isActive) {
entityListTool.setVisible(false); entityListTool.setVisible(false);
gridTool.setVisible(false); // gridTool.setVisible(false);
grid.setEnabled(false); grid.setEnabled(false);
propertiesTool.setVisible(false); propertiesTool.setVisible(false);
selectionManager.clearSelections(); selectionManager.clearSelections();
@ -344,7 +344,7 @@ var toolBar = (function() {
} else { } else {
hasShownPropertiesTool = false; hasShownPropertiesTool = false;
entityListTool.setVisible(true); entityListTool.setVisible(true);
gridTool.setVisible(true); // gridTool.setVisible(true);
grid.setEnabled(true); grid.setEnabled(true);
propertiesTool.setVisible(true); propertiesTool.setVisible(true);
Window.setFocus(); Window.setFocus();