godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Remove unintentional PROPERTY_USAGE_INTERNAL

Browse Source 
The flag only matters for property definition,
but was also used in _validate_property a lot.
This commit is contained in:
RedMser
2022-08-18 16:25:00 +02:00
parent 83f2723893
commit c25b8f2876
9 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scene/resources/environment.cpp
View File

@@ -1040,37 +1040,37 @@ void Environment::_update_adjustment() {
void Environment::_validate_property(PropertyInfo &property) const {
if (property.name == "sky" || property.name == "sky_custom_fov" || property.name == "sky_rotation" || property.name == "ambient_light_sky_contribution") {
if (bg_mode != BG_SKY && ambient_source != AMBIENT_SOURCE_SKY && reflection_source != REFLECTION_SOURCE_SKY) {
property.usage = PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL;
property.usage = PROPERTY_USAGE_NO_EDITOR;
}
}
if (property.name == "fog_aerial_perspective") {
if (bg_mode != BG_SKY) {
property.usage = PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL;
property.usage = PROPERTY_USAGE_NO_EDITOR;
}
}
if (property.name == "tonemap_white" && tone_mapper == TONE_MAPPER_LINEAR) {
property.usage = PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL;
property.usage = PROPERTY_USAGE_NO_EDITOR;
}
if (property.name == "glow_intensity" && glow_blend_mode == GLOW_BLEND_MODE_MIX) {
property.usage = PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL;
property.usage = PROPERTY_USAGE_NO_EDITOR;
}
if (property.name == "glow_mix" && glow_blend_mode != GLOW_BLEND_MODE_MIX) {
property.usage = PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL;
property.usage = PROPERTY_USAGE_NO_EDITOR;
}
if (property.name == "background_color") {
if (bg_mode != BG_COLOR && ambient_source != AMBIENT_SOURCE_COLOR) {
property.usage = PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL;
property.usage = PROPERTY_USAGE_NO_EDITOR;
}
}
if (property.name == "background_canvas_max_layer") {
if (bg_mode != BG_CANVAS) {
property.usage = PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL;
property.usage = PROPERTY_USAGE_NO_EDITOR;
}
}
@@ -1108,7 +1108,7 @@ void Environment::_validate_property(PropertyInfo &property) const {
String enabled = prefix + "enabled";
if (property.name.begins_with(prefix) && property.name != enabled && !bool(get(enabled))) {
property.usage = PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL;
property.usage = PROPERTY_USAGE_NO_EDITOR;
return;
}
@@ -1121,7 +1121,7 @@ void Environment::_validate_property(PropertyInfo &property) const {
String prefix = String(*prefixes);
if (property.name.begins_with(prefix)) {
property.usage = PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL;
property.usage = PROPERTY_USAGE_NO_EDITOR;
return;
}