diff options
| author | Valerio Virgillito | 2012-02-23 00:34:37 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-23 00:34:37 -0800 |
| commit | 3675cac3993430490d9eef18157314d53ffa1a6a (patch) | |
| tree | fb225a6d8fc3c983c96b1507483d628909dc8c1e /js/controllers/elements/image-controller.js | |
| parent | 2afef244a3f8124f8a049e504e9782c05904ce23 (diff) | |
| parent | 3730bbc7cc5d5f07b3d788885475a8f9810b480e (diff) | |
| download | ninja-3675cac3993430490d9eef18157314d53ffa1a6a.tar.gz | |
Merge pull request #60 from mqg734/WebGLMaterials
Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.
Diffstat (limited to 'js/controllers/elements/image-controller.js')
| -rwxr-xr-x | js/controllers/elements/image-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/elements/image-controller.js b/js/controllers/elements/image-controller.js index 5abce13e..25ca8da6 100755 --- a/js/controllers/elements/image-controller.js +++ b/js/controllers/elements/image-controller.js | |||
| @@ -19,7 +19,7 @@ exports.ImageController = Montage.create(ElementController, { | |||
| 19 | return el.getAttribute(prop); | 19 | return el.getAttribute(prop); |
| 20 | break; | 20 | break; |
| 21 | default: | 21 | default: |
| 22 | return ElementController.getProperty(el, prop); | 22 | return ElementController.getProperty(el, prop, true); |
| 23 | } | 23 | } |
| 24 | } | 24 | } |
| 25 | }, | 25 | }, |