diff options
| author | Jonathan Duran | 2012-07-23 08:25:56 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-07-23 08:25:56 -0700 |
| commit | e7268388a99722dd7bb64506893538fd0ee96a71 (patch) | |
| tree | 9e0f960030f1625f730bbd60ca79ce449a788df0 /js/controllers | |
| parent | 3487c690d526534f27578acdffe1a45f2526cbf6 (diff) | |
| parent | 2b05717e49bafc4b401441d9a55153b9e4ae7e43 (diff) | |
| download | ninja-e7268388a99722dd7bb64506893538fd0ee96a71.tar.gz | |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
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 | } |