mirror of
https://github.com/dataarts/dat.gui.git
synced 2024-12-12 04:08:27 +00:00
merged slider changes
This commit is contained in:
parent
a039298731
commit
8cf2f47f5a
@ -80,11 +80,7 @@ var NumberController = function() {
|
||||
} else if(isDragged) {
|
||||
if(inc != slider.value) inc = slider.value;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
updateValue(inc);
|
||||
=======
|
||||
return false;
|
||||
>>>>>>> b8323ce896a851bbe5a18e17bff36a5bdaa97db1
|
||||
}, false);
|
||||
|
||||
function updateValue(val) {
|
||||
|
Loading…
Reference in New Issue
Block a user