Merge pull request #4278 from huffman/fix-edit-grid

Fix edit grid
This commit is contained in:
Brad Hefta-Gaub 2015-02-12 17:20:03 -08:00
commit 6c8a78a9a7
2 changed files with 4 additions and 3 deletions

View file

@ -190,6 +190,7 @@ var toolBar = (function () {
cameraManager.enable(); cameraManager.enable();
entityListTool.setVisible(true); entityListTool.setVisible(true);
gridTool.setVisible(true); gridTool.setVisible(true);
grid.setEnabled(true);
propertiesTool.setVisible(true); propertiesTool.setVisible(true);
Window.setFocus(); Window.setFocus();
} }

View file

@ -30,8 +30,8 @@
elPosY.value = origin.y.toFixed(2); elPosY.value = origin.y.toFixed(2);
} }
if (data.minorGridSpacing !== undefined) { if (data.minorGridWidth !== undefined) {
elMinorSpacing.value = data.minorGridSpacing; elMinorSpacing.value = data.minorGridWidth;
} }
if (data.majorGridEvery !== undefined) { if (data.majorGridEvery !== undefined) {
@ -57,7 +57,7 @@
origin: { origin: {
y: elPosY.value, y: elPosY.value,
}, },
minorGridSpacing: elMinorSpacing.value, minorGridWidth: elMinorSpacing.value,
majorGridEvery: elMajorSpacing.value, majorGridEvery: elMajorSpacing.value,
gridColor: gridColor, gridColor: gridColor,
colorIndex: gridColorIndex, colorIndex: gridColorIndex,