diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-08-17 18:26:57 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-08-17 18:33:59 -0300 |
| commit | 3a4ff3402dedab5f30b0f97aeadec6cf61f29a40 (patch) | |
| tree | 6d44198ad822c8f12ce511fc7249d12daf1d95a2 | |
| parent | ee59e627ded8c9d0a3d2d33b2d6cc6734a62b04d (diff) | |
Oops, fixed wrong color masking problem. Closes #10149
| -rw-r--r-- | drivers/gles3/rasterizer_storage_gles3.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/material.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index 24fa117051..8dd083fbe8 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -2143,7 +2143,7 @@ _FORCE_INLINE_ static void _fill_std140_variant_ubo_value(ShaderLanguage::DataTy gui[0] = v.normal.x; gui[1] = v.normal.y; - gui[2] = v.normal.x; + gui[2] = v.normal.z; gui[3] = v.d; } } break; diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index bc23a41ede..a111f64e06 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -1384,7 +1384,7 @@ static Plane _get_texture_mask(SpatialMaterial::TextureChannel p_channel) { } void SpatialMaterial::set_metallic_texture_channel(TextureChannel p_channel) { - + ERR_FAIL_INDEX(p_channel, 5); metallic_texture_channel = p_channel; VS::get_singleton()->material_set_param(_get_material(), shader_names->metallic_texture_channel, _get_texture_mask(p_channel)); } @@ -1395,6 +1395,7 @@ SpatialMaterial::TextureChannel SpatialMaterial::get_metallic_texture_channel() void SpatialMaterial::set_roughness_texture_channel(TextureChannel p_channel) { + ERR_FAIL_INDEX(p_channel, 5); roughness_texture_channel = p_channel; VS::get_singleton()->material_set_param(_get_material(), shader_names->roughness_texture_channel, _get_texture_mask(p_channel)); } |