summaryrefslogtreecommitdiffstats
path: root/scene/resources/material.cpp
diff options
context:
space:
mode:
authorGeorge L. Albany <Megacake1234@gmail.com>2024-11-27 21:15:49 +0000
committerGitHub <noreply@github.com>2024-11-27 21:15:49 +0000
commit85d87116e184e7923b8d6804cab2681b61c62d83 (patch)
tree55ec5bfa061a5c27272b831e697b78ed1b756a70 /scene/resources/material.cpp
parentb06d20bf39d15ec736d08d4e4fcb32e0c3c1ce1e (diff)
parent721f53fde47c2727d99e3ecccdb789a67df36de0 (diff)
downloadredot-engine-85d87116e184e7923b8d6804cab2681b61c62d83.tar.gz
Merge pull request #886 from Spartan322/merge/f128f38HEADmaster
Merge commit godotengine/godot@f128f38
Diffstat (limited to 'scene/resources/material.cpp')
-rw-r--r--scene/resources/material.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index b7f5c4c338..2b15a123b9 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -2739,13 +2739,13 @@ float BaseMaterial3D::get_grow() const {
return grow;
}
-static Plane _get_texture_mask(BaseMaterial3D::TextureChannel p_channel) {
- static const Plane masks[5] = {
- Plane(1, 0, 0, 0),
- Plane(0, 1, 0, 0),
- Plane(0, 0, 1, 0),
- Plane(0, 0, 0, 1),
- Plane(0.3333333, 0.3333333, 0.3333333, 0),
+static Vector4 _get_texture_mask(BaseMaterial3D::TextureChannel p_channel) {
+ static const Vector4 masks[5] = {
+ Vector4(1, 0, 0, 0),
+ Vector4(0, 1, 0, 0),
+ Vector4(0, 0, 1, 0),
+ Vector4(0, 0, 0, 1),
+ Vector4(0.3333333, 0.3333333, 0.3333333, 0),
};
return masks[p_channel];