diff options
| author | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
| commit | 4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch) | |
| tree | c5b17297aba04bd54a59cf6214d29486e089031b /js/panels/Materials/materials-popup.reel/materials-popup.html | |
| parent | 75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff) | |
| parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
| download | ninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.html')
| -rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index d18599d6..bac722cd 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.html | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | "data": { | 43 | "data": { |
| 44 | "boundObject": {"@": "materialsProperties"}, | 44 | "boundObject": {"@": "materialsProperties"}, |
| 45 | "boundObjectPropertyPath": "objectAtCurrentIteration", | 45 | "boundObjectPropertyPath": "objectAtCurrentIteration", |
| 46 | "oneway": false | 46 | "oneway": true |
| 47 | } | 47 | } |
| 48 | }, | 48 | }, |
| 49 | "listeners": [ | 49 | "listeners": [ |