Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
3a4ff340
Commit
3a4ff340
authored
Aug 17, 2017
by
Juan Linietsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Oops, fixed wrong color masking problem. Closes #10149
parent
ee59e627
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
rasterizer_storage_gles3.cpp
drivers/gles3/rasterizer_storage_gles3.cpp
+1
-1
material.cpp
scene/resources/material.cpp
+2
-1
No files found.
drivers/gles3/rasterizer_storage_gles3.cpp
View file @
3a4ff340
...
...
@@ -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
;
...
...
scene/resources/material.cpp
View file @
3a4ff340
...
...
@@ -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
));
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment