diff options
134 files changed, 11494 insertions, 2840 deletions
diff --git a/js/panels/Timeline/TimelineController.js b/assets/shaders/Basic.frag.glsl index 6602994d..a2c21afa 100644 --- a/js/panels/Timeline/TimelineController.js +++ b/assets/shaders/Basic.frag.glsl | |||
@@ -4,10 +4,14 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | var Montage = require("montage/core/core").Montage; | ||
8 | 7 | ||
9 | var TimelineController = exports.TimelineController = Montage.create(Montage, { | 8 | #ifdef GL_ES |
9 | precision highp float; | ||
10 | #endif | ||
10 | 11 | ||
11 | |||
12 | 12 | ||
13 | }); \ No newline at end of file | 13 | uniform vec4 color; |