diff options
| author | Valerio Virgillito | 2012-07-20 15:45:23 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-20 15:45:23 -0700 |
| commit | a9b17cef34d3c4f222b6f4d0949fa3c2bbfe867b (patch) | |
| tree | 5adb6c7c4bf4e13c70379050627ad6d42a7a86e6 /js/controllers | |
| parent | 288b81e06db68b785524db5c7f7ae1ecbc3d83b1 (diff) | |
| parent | d7f5d6ffb39d55f2d4f4f366421571826df1e8bb (diff) | |
| download | ninja-a9b17cef34d3c4f222b6f4d0949fa3c2bbfe867b.tar.gz | |
Merge branch 'Fixes_071' of https://github.com/mqg734/ninja
Diffstat (limited to 'js/controllers')
| -rwxr-xr-x | js/controllers/elements/shapes-controller.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index 1d945066..6dabff47 100755 --- a/js/controllers/elements/shapes-controller.js +++ b/js/controllers/elements/shapes-controller.js | |||
| @@ -841,10 +841,10 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
| 841 | child.strokeMat = "Linear Gradient"; | 841 | child.strokeMat = "Linear Gradient"; |
| 842 | } | 842 | } |
| 843 | } | 843 | } |
| 844 | else if( (child.strokeMat === "Radial Gradient") || | 844 | else if( !child.strokeMat || (child.strokeMat === "Radial Gradient") || |
| 845 | (child.strokeMat === "Linear Gradient") ) | 845 | (child.strokeMat === "Linear Gradient") ) |
| 846 | { | 846 | { |
| 847 | // Set Flat Material for children geometry if color has been changed to solid | 847 | // Set Flat Material for children geometry if no material defined or color has been changed to solid |
| 848 | child.strokeMat = "Flat"; | 848 | child.strokeMat = "Flat"; |
| 849 | } | 849 | } |
| 850 | } | 850 | } |
| @@ -863,10 +863,10 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
| 863 | child.fillMat = "Linear Gradient"; | 863 | child.fillMat = "Linear Gradient"; |
| 864 | } | 864 | } |
| 865 | } | 865 | } |
| 866 | else if( (child.fillMat === "Radial Gradient") || | 866 | else if( !child.fillMat || (child.fillMat === "Radial Gradient") || |
| 867 | (child.fillMat === "Linear Gradient") ) | 867 | (child.fillMat === "Linear Gradient") ) |
| 868 | { | 868 | { |
| 869 | // Set Flat Material for children geometry if color has been changed to solid | 869 | // Set Flat Material for children geometry if no material defined or color has been changed to solid |
| 870 | child.fillMat = "Flat"; | 870 | child.fillMat = "Flat"; |
| 871 | } | 871 | } |
| 872 | } | 872 | } |