diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-12-02 01:04:56 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-12-02 01:04:56 +0100 |
| commit | 2feac960904b0b94d05253e4c345f1853ed3bbbf (patch) | |
| tree | a77f2fa5c805daa140111b57d205feccddbae99f | |
| parent | 566fbe751a4094db7c3d553d3866f0c057db18c9 (diff) | |
Fixed two minor issues (mDiffuseAlphaMode and mAlphaMaskCutoff were reversed; specular rotation had wrong format specifier)
| -rw-r--r-- | indra/llprimitive/llmaterial.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llfloaterdebugmaterials.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp index 36d958ede5..b07b4ce72d 100644 --- a/indra/llprimitive/llmaterial.cpp +++ b/indra/llprimitive/llmaterial.cpp @@ -142,6 +142,6 @@ void LLMaterial::fromLLSD(const LLSD& material_data) mSpecularLightColor.setValue(getMaterialField<LLSD>(material_data, MATERIALS_CAP_SPECULAR_COLOR_FIELD, LLSD::TypeArray)); mSpecularLightExponent = (U8)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_EXP_FIELD, LLSD::TypeInteger); mEnvironmentIntensity = (U8)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_ENV_INTENSITY_FIELD, LLSD::TypeInteger); - mDiffuseAlphaMode = (U8)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_ALPHA_MASK_CUTOFF_FIELD, LLSD::TypeInteger); - mAlphaMaskCutoff = (U8)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_DIFFUSE_ALPHA_MODE_FIELD, LLSD::TypeInteger); + mDiffuseAlphaMode = (U8)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_DIFFUSE_ALPHA_MODE_FIELD, LLSD::TypeInteger); + mAlphaMaskCutoff = (U8)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_ALPHA_MASK_CUTOFF_FIELD, LLSD::TypeInteger); } diff --git a/indra/newview/llfloaterdebugmaterials.cpp b/indra/newview/llfloaterdebugmaterials.cpp index e86777bfe0..026fd1a28c 100644 --- a/indra/newview/llfloaterdebugmaterials.cpp +++ b/indra/newview/llfloaterdebugmaterials.cpp @@ -1104,7 +1104,7 @@ void LLFloaterDebugMaterials::parseGetResponse() specularMapRowParams.columns.add(cellParams); cellParams.column = "specular_map_list_rotation"; - cellParams.value = llformat("%d", material.getSpecularRotation()); + cellParams.value = llformat("%f", material.getSpecularRotation()); specularMapRowParams.columns.add(cellParams); const LLColor4U& specularColor = material.getSpecularLightColor(); |