| commit | b67b8e6052bf5567eb3f9726dda99a6b260dfb05 | [log] [tgz] |
|---|---|---|
| author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Mon May 12 18:12:24 2014 +0000 |
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Mon May 12 18:12:24 2014 +0000 |
| tree | 412d59e9dc51cebabaad8939d607c8e78fc5f1d9 | |
| parent | a501a64827ca3d67d45441e42bc377207eb5041b [diff] [blame] |
apply localmatrix in pre-order, to match other shaders BUG=skia: Review URL: https://codereview.chromium.org/280293002 git-svn-id: http://skia.googlecode.com/svn/trunk@14699 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index 1015377..6864554 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp
@@ -439,7 +439,10 @@ : INHERITED(shader, rec) { SkMatrix newMatrix = *rec.fMatrix; - newMatrix.postConcat(shader.getLocalMatrix()); + newMatrix.preConcat(shader.getLocalMatrix()); + if (rec.fLocalMatrix) { + newMatrix.preConcat(*rec.fLocalMatrix); + } SkMatrix invMatrix; if (!newMatrix.invert(&invMatrix)) { invMatrix.reset();