diff options
| author | pepper <peppersclothescult@gmail.com> | 2014-01-19 18:16:53 -0800 |
|---|---|---|
| committer | pepper <peppersclothescult@gmail.com> | 2014-01-19 18:16:53 -0800 |
| commit | 5301a264c8da39a9401ab9d619477e0ea2c83dc1 (patch) | |
| tree | 4d458e4f20f72213549f12e000022cbd93e3f237 /shader-picker.html | |
| parent | f01087dbacca5640205cd2d8c6629b244a15ed74 (diff) | |
| parent | 1e739b4df7e03cc94997e5b5b5c8180b0962e5ee (diff) | |
mergin'
Merge branch 'master' of ghghgh.us:/home/git/dither into pepper
Diffstat (limited to 'shader-picker.html')
| -rw-r--r-- | shader-picker.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shader-picker.html b/shader-picker.html index 27f537d..59b3e27 100644 --- a/shader-picker.html +++ b/shader-picker.html @@ -145,8 +145,8 @@ function init(){ stop: drag_stop }); $(document).on("mousemove", function(e) { - mousex = event.pageX - mousey = event.pageY + mousex = e.pageX + mousey = e.pageY }) $(document).on("click","#frames .remove",remove_frame) $("#framecount").change(function(){ |