diff options
| author | Valerio Virgillito | 2012-02-08 10:18:36 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-08 10:18:36 -0800 |
| commit | 763910b9d074137eb7dee80447b89407ce5750c9 (patch) | |
| tree | 3c8820a06afd442fa5ba8e68665a4d2836230628 /js/preloader | |
| parent | e5579374ff39b80b8c0c69faba37f6f581758fe0 (diff) | |
| parent | 329a859e2666716c3a1d99c6bd2679e10c81fc8d (diff) | |
| download | ninja-763910b9d074137eb7dee80447b89407ce5750c9.tar.gz | |
Merge pull request #20 from mqg734/ToolFixes
Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs:
Diffstat (limited to 'js/preloader')
| -rwxr-xr-x | js/preloader/Preloader.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index 93d71e8f..42460093 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js | |||
| @@ -60,6 +60,7 @@ exports.Preloader = Montage.create(Component, { | |||
| 60 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/util/dbgpanel.js"}, | 60 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/util/dbgpanel.js"}, |
| 61 | /* */ | 61 | /* */ |
| 62 | 62 | ||
| 63 | {"type":"js", "url":"js/helper-classes/3D/ParseUtils.js"}, | ||
| 63 | {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, | 64 | {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, |
| 64 | {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, | 65 | {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, |
| 65 | {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, | 66 | {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, |