diff options
| author | Valerio Virgillito | 2012-07-19 15:59:27 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-19 15:59:27 -0700 |
| commit | 4b1a4b6b424400080271202800d2de78e5509708 (patch) | |
| tree | 6554afcb8c3b8d83d1e9bb33241e239773f396e8 /assets/descriptor.json | |
| parent | c97f806fceb2a2e3c668b965e4f8e6fc047a3d9a (diff) | |
| parent | 431b6fa7610e59074b4ebb3e9e712672f185b8ad (diff) | |
| download | ninja-4b1a4b6b424400080271202800d2de78e5509708.tar.gz | |
Merge branch 'RadialBlur' of https://github.com/ericmueller/ninja into v0.7.1
Diffstat (limited to 'assets/descriptor.json')
| -rw-r--r-- | assets/descriptor.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json index d9d74e6b..db824387 100644 --- a/assets/descriptor.json +++ b/assets/descriptor.json | |||
| @@ -20,9 +20,9 @@ | |||
| 20 | "images/cubelight.png", | 20 | "images/cubelight.png", |
| 21 | "images/random_normal.png", | 21 | "images/random_normal.png", |
| 22 | "images/white.png", | 22 | "images/white.png", |
| 23 | "images/paris.png", | 23 | "images/bluesky.png", |
| 24 | "images/powderblue.png", | 24 | "images/powderblue.png", |
| 25 | "images/raiders.png", | 25 | "images/darkblur.png", |
| 26 | "images/us_flag.png", | 26 | "images/us_flag.png", |
| 27 | "shaders/Basic.frag.glsl", | 27 | "shaders/Basic.frag.glsl", |
| 28 | "shaders/TwistVert.vert.glsl", | 28 | "shaders/TwistVert.vert.glsl", |
| @@ -34,9 +34,9 @@ | |||
| 34 | "shaders/linearGradient.frag.glsl", | 34 | "shaders/linearGradient.frag.glsl", |
| 35 | "shaders/linearGradient.vert.glsl", | 35 | "shaders/linearGradient.vert.glsl", |
| 36 | "shaders/plasma.frag.glsl", | 36 | "shaders/plasma.frag.glsl", |
| 37 | "shaders/Paris.frag.glsl", | ||
| 38 | "shaders/plasma.vert.glsl", | 37 | "shaders/plasma.vert.glsl", |
| 39 | "shaders/Pulse.frag.glsl", | 38 | "shaders/Pulse.frag.glsl", |
| 39 | "shaders/radialBlur.frag.glsl", | ||
| 40 | "shaders/radialGradient.frag.glsl", | 40 | "shaders/radialGradient.frag.glsl", |
| 41 | "shaders/radialGradient.vert.glsl", | 41 | "shaders/radialGradient.vert.glsl", |
| 42 | "shaders/test_fshader.glsl", | 42 | "shaders/test_fshader.glsl", |