Merge pull request #111060 from Kaleb-Reid/fix-dof-enable

Repiteo · Repiteo · commit 33bfd1fac4cb · 2025-10-01T17:54:18.000-05:00
Always show settings to enable DOF near + far
diff --git a/scene/resources/camera_attributes.cpp b/scene/resources/camera_attributes.cpp
@@ -259,8 +259,8 @@ void CameraAttributesPractical::_validate_property(PropertyInfo &p_property) con
 	if (!Engine::get_singleton()->is_editor_hint()) {
 		return;
 	}
-	if ((!dof_blur_far_enabled && p_property.name.begins_with("dof_blur_far_")) ||
-			(!dof_blur_near_enabled && p_property.name.begins_with("dof_blur_near_"))) {
+	if ((p_property.name != "dof_blur_far_enabled" && !dof_blur_far_enabled && p_property.name.begins_with("dof_blur_far_")) ||
+			(p_property.name != "dof_blur_near_enabled" && !dof_blur_near_enabled && p_property.name.begins_with("dof_blur_near_"))) {
 		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -259,8 +259,8 @@ void CameraAttributesPractical::_validate_property(PropertyInfo &p_property) con`
`259`	`259`	`if (!Engine::get_singleton()->is_editor_hint()) {`
`260`	`260`	`return;`
`261`	`261`	`}`
`262`		`- if ((!dof_blur_far_enabled && p_property.name.begins_with("dof_blur_far_")) \|\|`
`263`		`- (!dof_blur_near_enabled && p_property.name.begins_with("dof_blur_near_"))) {`
	`262`	`+ if ((p_property.name != "dof_blur_far_enabled" && !dof_blur_far_enabled && p_property.name.begins_with("dof_blur_far_")) \|\|`
	`263`	`+ (p_property.name != "dof_blur_near_enabled" && !dof_blur_near_enabled && p_property.name.begins_with("dof_blur_near_"))) {`
`264`	`264`	`p_property.usage = PROPERTY_USAGE_NO_EDITOR;`
`265`	`265`	`}`
`266`	`266`	`}`