diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 02:03:59 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 02:03:59 +0000 |
| commit | f1a4c1028f914af584e4f6ef0c5e4511d9b78889 (patch) | |
| tree | 822a0d8f3101477d1732d0ff8cae555943b0b815 /o3d/samples/o3djs | |
| parent | 5ce3ef71348f26f940c62decf1bfb9d735993e90 (diff) | |
| download | chromium_src-f1a4c1028f914af584e4f6ef0c5e4511d9b78889.zip chromium_src-f1a4c1028f914af584e4f6ef0c5e4511d9b78889.tar.gz chromium_src-f1a4c1028f914af584e4f6ef0c5e4511d9b78889.tar.bz2 | |
Fixes the compiled o3djs libraries.
The issue was that lineprimitves.js creates
an object that inherits from something in
primitives.js but because it appeared first
in the compiled version the inherit command
failed since the object it inherited from
was not yet defined.
It might be possible to make build_docs.py
move all the inherit commands to the end
of the compiled o3djs libs. I'll have to
look into it.
In the meantime here is a manual fix.
Review URL: http://codereview.chromium.org/464030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/o3djs')
| -rw-r--r-- | o3d/samples/o3djs/js_list.manifest | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/o3d/samples/o3djs/js_list.manifest b/o3d/samples/o3djs/js_list.manifest index 6548155..d88fcad 100644 --- a/o3d/samples/o3djs/js_list.manifest +++ b/o3d/samples/o3djs/js_list.manifest @@ -39,7 +39,6 @@ 'event.js', 'fps.js', 'io.js', - 'lineprimitives.js', 'loader.js', 'material.js', 'math.js', @@ -48,6 +47,7 @@ 'performance.js', 'picking.js', 'primitives.js', + 'lineprimitives.js', # lineprimitives.js must come after primitives.js 'quaternions.js', 'rendergraph.js', 'scene.js', |