godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22461 from dlasalle/#10480 

Hide shading options in SpatialMaterial when 'FLAG_UNSHADED' is set.
This commit is contained in:
Rémi Verschelde 2018-12-11 16:12:56 +01:00 committed by GitHub
parent 022ae53191 4a60679f31
commit 573956915e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
scene/resources/material.cpp
View File

@ -1315,7 +1315,7 @@ void SpatialMaterial::set_flag(Flags p_flag, bool p_enabled) {
return;
flags[p_flag] = p_enabled;
if (p_flag == FLAG_USE_ALPHA_SCISSOR) {
if (p_flag == FLAG_USE_ALPHA_SCISSOR || p_flag == FLAG_UNSHADED) {
_change_notify();
}
_queue_shader_change();
@ -1421,6 +1421,48 @@ void SpatialMaterial::_validate_property(PropertyInfo &property) const {
if ((property.name == "depth_min_layers" || property.name == "depth_max_layers") && !deep_parallax) {
property.usage = 0;
}
if (flags[FLAG_UNSHADED]) {
if (property.name.begins_with("anisotropy")) {
property.usage = 0;
}
if (property.name.begins_with("ao")) {
property.usage = 0;
}
if (property.name.begins_with("clearcoat")) {
property.usage = 0;
}
if (property.name.begins_with("emission")) {
property.usage = 0;
}
if (property.name.begins_with("metallic")) {
property.usage = 0;
}
if (property.name.begins_with("normal")) {
property.usage = 0;
}
if (property.name.begins_with("rim")) {
property.usage = 0;
}
if (property.name.begins_with("roughness")) {
property.usage = 0;
}
if (property.name.begins_with("subsurf_scatter")) {
property.usage = 0;
}
if (property.name.begins_with("transmission")) {
property.usage = 0;
}
}
}
void SpatialMaterial::set_line_width(float p_line_width) {