diff options
| author | 2015-02-20 22:56:54 +0000 | |
|---|---|---|
| committer | 2015-02-20 22:56:55 +0000 | |
| commit | 06518aa8deff2808b873b2639e9949a369bb6576 (patch) | |
| tree | cf922c0214970ba9ca22eec907b2d091bb0dbbff /libs/hwui/Caches.cpp | |
| parent | c0a9a7ad6d96b7c59e1056f4a6638e344497b337 (diff) | |
| parent | 62aa44c5eef2b1e888f0eee8841dc87074eaa0e8 (diff) | |
Merge "Correctly name the lightRadius"
Diffstat (limited to 'libs/hwui/Caches.cpp')
| -rw-r--r-- | libs/hwui/Caches.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp index a0a2bed432ba..bd933b8db48f 100644 --- a/libs/hwui/Caches.cpp +++ b/libs/hwui/Caches.cpp @@ -405,7 +405,7 @@ TextureVertex* Caches::getRegionMesh() { /////////////////////////////////////////////////////////////////////////////// void Caches::initTempProperties() { - propertyLightDiameter = -1.0f; + propertyLightRadius = -1.0f; propertyLightPosY = -1.0f; propertyLightPosZ = -1.0f; propertyAmbientRatio = -1.0f; @@ -419,9 +419,9 @@ void Caches::setTempProperty(const char* name, const char* value) { propertyAmbientRatio = fmin(fmax(atof(value), 0.0), 10.0); ALOGD("ambientRatio = %.2f", propertyAmbientRatio); return; - } else if (!strcmp(name, "lightDiameter")) { - propertyLightDiameter = fmin(fmax(atof(value), 0.0), 3000.0); - ALOGD("lightDiameter = %.2f", propertyLightDiameter); + } else if (!strcmp(name, "lightRadius")) { + propertyLightRadius = fmin(fmax(atof(value), 0.0), 3000.0); + ALOGD("lightRadius = %.2f", propertyLightRadius); return; } else if (!strcmp(name, "lightPosY")) { propertyLightPosY = fmin(fmax(atof(value), 0.0), 3000.0); |