diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/lib/rdge/materials/material-parser.js | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/lib/rdge/materials/material-parser.js')
| -rwxr-xr-x | js/lib/rdge/materials/material-parser.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/lib/rdge/materials/material-parser.js b/js/lib/rdge/materials/material-parser.js index 6bf23b6e..6d9433e9 100755 --- a/js/lib/rdge/materials/material-parser.js +++ b/js/lib/rdge/materials/material-parser.js | |||
| @@ -66,9 +66,9 @@ var MaterialParser = function MaterialParser(theStr) { | |||
| 66 | if (!this._strBuffer) return; | 66 | if (!this._strBuffer) return; |
| 67 | 67 | ||
| 68 | // find the limits | 68 | // find the limits |
| 69 | var index = this._strBuffer.search(/\S/); // first non-whitespace character | 69 | var index = this._strBuffer.search(/\S/); // first non-whitespace character |
| 70 | if (index > 0) this._strBuffer = this._strBuffer.slice(index); | 70 | if (index > 0) this._strBuffer = this._strBuffer.slice(index); |
| 71 | index = this._strBuffer.search(/\s/); // first whitespace character marking the end of the token | 71 | index = this._strBuffer.search(/\s/); // first whitespace character marking the end of the token |
| 72 | 72 | ||
| 73 | var token; | 73 | var token; |
| 74 | if (index > 0) { | 74 | if (index > 0) { |