diff options
author | 2016-08-05 12:44:59 -0700 | |
---|---|---|
committer | 2016-08-05 12:44:59 -0700 | |
commit | 8254e00fd605f4e3e9b832d3323211670a9ef5c4 (patch) | |
tree | 1377932b165fbb5f3a2522b115a1f07575e2db1e | |
parent | 20ea6a378b96de7c1b3b39fd0db93b1b3f6a9635 (diff) | |
parent | 44a291e3f481134c920c615ae7f829e93301c839 (diff) |
resolve merge conflicts of 44a291e to master
Change-Id: I38caea0ea35dcca765fd82a5509177ddd3b6f511
-rw-r--r-- | libs/hwui/Snapshot.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/hwui/Snapshot.cpp b/libs/hwui/Snapshot.cpp index 21c26f7a1d44..f61c3e9825f8 100644 --- a/libs/hwui/Snapshot.cpp +++ b/libs/hwui/Snapshot.cpp @@ -35,6 +35,7 @@ Snapshot::Snapshot() , projectionPathMask(nullptr) , mClipArea(&mClipAreaRoot) { transform = &mTransformRoot; + mRelativeLightCenter.x = mRelativeLightCenter.y = mRelativeLightCenter.z = 0; } /** |