diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-09 00:24:08 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-09 00:24:08 -0500 |
| commit | 3ede390b87507cd6a6ef31ac3f1be1906abcb723 (patch) | |
| tree | 3578ae46b8281dc4e6a1e2557cec03d54859f693 | |
| parent | 66fdaf51350734d4d69ebcea548165decbb6526a (diff) | |
| parent | b6e7d771dab572a6783a47bd1359776c4e721ec1 (diff) | |
merge
| -rw-r--r-- | indra/llmath/llvolume.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 53f73d8637..9eecb7bfe2 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -3232,7 +3232,11 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, // don't test lowest LOD to support legacy content DEV-33670 if (mDetail > SCULPT_MIN_AREA_DETAIL) { - if (sculptGetSurfaceArea() < SCULPT_MIN_AREA) + F32 area = sculptGetSurfaceArea(); + + const F32 SCULPT_MAX_AREA = 32.f; + + if (area < SCULPT_MIN_AREA || area > SCULPT_MAX_AREA) { data_is_empty = TRUE; } diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl index 5e6c5ebec8..d781e08548 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl @@ -23,7 +23,6 @@ void main() color.rgb = fullbrightScaleSoftClip(color.rgb); - //gl_FragColor = color; - gl_FragColor = vec4(1,0,1,1); + gl_FragColor = color; } |