Merge pull request #112378 from akien-mga/revert-112322

akien-mga · akien-mga · commit 630938a4d6a4 · 2025-11-04T10:53:44.000+01:00
Revert "Fix visual shader items not applying the correct theme components"
diff --git a/editor/shader/shader_editor_plugin.cpp b/editor/shader/shader_editor_plugin.cpp
@@ -174,9 +174,7 @@ void ShaderEditorPlugin::edit(Object *p_object) {
 		} else {
 			es.shader_editor = memnew(TextShaderEditor);
 		}
-		// Needs to be deferred so it's called after entering the scene tree,
-		// otherwise it won't be able to correctly fetch the editor theme.
-		callable_mp(es.shader_editor, &ShaderEditor::edit_shader).call_deferred(es.shader);
+		es.shader_editor->edit_shader(es.shader);
 	}
 
 	// TextShaderEditor-specific setup code.

Original file line number	Diff line number	Diff line change
`@@ -174,9 +174,7 @@ void ShaderEditorPlugin::edit(Object *p_object) {`
`174`	`174`	`} else {`
`175`	`175`	`es.shader_editor = memnew(TextShaderEditor);`
`176`	`176`	`}`
`177`		`- // Needs to be deferred so it's called after entering the scene tree,`
`178`		`- // otherwise it won't be able to correctly fetch the editor theme.`
`179`		`- callable_mp(es.shader_editor, &ShaderEditor::edit_shader).call_deferred(es.shader);`
	`177`	`+ es.shader_editor->edit_shader(es.shader);`
`180`	`178`	`}`
`181`	`179`
`182`	`180`	`// TextShaderEditor-specific setup code.`