diff options
| author | Valerio Virgillito | 2012-02-23 00:34:37 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-23 00:34:37 -0800 |
| commit | 3675cac3993430490d9eef18157314d53ffa1a6a (patch) | |
| tree | fb225a6d8fc3c983c96b1507483d628909dc8c1e /js/data | |
| parent | 2afef244a3f8124f8a049e504e9782c05904ce23 (diff) | |
| parent | 3730bbc7cc5d5f07b3d788885475a8f9810b480e (diff) | |
| download | ninja-3675cac3993430490d9eef18157314d53ffa1a6a.tar.gz | |
Merge pull request #60 from mqg734/WebGLMaterials
Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.
Diffstat (limited to 'js/data')
| -rwxr-xr-x | js/data/tools-data.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 4847fa7c..00de9236 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js | |||
| @@ -174,7 +174,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
| 174 | "spriteSheet": true, | 174 | "spriteSheet": true, |
| 175 | "action": "EyedropperTool", | 175 | "action": "EyedropperTool", |
| 176 | "toolTip": "Eyedropper Tool", | 176 | "toolTip": "Eyedropper Tool", |
| 177 | "cursor": "url('images/tools/eyedropper_down.png'), default", | 177 | "cursor": "url('images/tools/eyedropper_down.png') 6 20, default", |
| 178 | "lastInGroup": false, | 178 | "lastInGroup": false, |
| 179 | "container": false, | 179 | "container": false, |
| 180 | "selected": false | 180 | "selected": false |