Skip to content

Allow dragging from shader editor to material - #113748

Merged
Repiteo merged 1 commit into
godotengine:masterfrom
KoBeWi:shadragger
Jan 27, 2026
Merged

Allow dragging from shader editor to material#113748
Repiteo merged 1 commit into
godotengine:masterfrom
KoBeWi:shadragger

Conversation

@KoBeWi

@KoBeWi KoBeWi commented Dec 8, 2025

Copy link
Copy Markdown
Member

Closes godotengine/godot-proposals#13802

I ended up also doing some refactoring.

@KoBeWi KoBeWi added this to the 4.x milestone Dec 8, 2025
@KoBeWi
KoBeWi requested a review from a team as a code owner December 8, 2025 12:51
@KoBeWi
KoBeWi requested a review from a team as a code owner December 8, 2025 12:51
@KoBeWi
KoBeWi requested a review from a team December 8, 2025 12:51

@Calinou Calinou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested locally, it mostly works as expected. Code looks good to me.

Undo/redo isn't working very consistently though. It will work in simple scenarios (assign material then undo), but if you perform multiple drag-and-drops, the first undo operation will appear to do nothing, then the second undo operation will revert to the state before either of the materials were drag-and-dropped:

shader_bottom_panel_drag_and_drop.mp4

Note that you need to right-click the 3D editor viewport once after the second drag-and-drop so that it gets focus (otherwise, undo will affect the text in the shader editor).

@KoBeWi

KoBeWi commented Dec 9, 2025

Copy link
Copy Markdown
Member Author

Does the undo issue also happen when you drag a file from FileSystem? If yes then it's not relevant for this PR.

@Calinou

Calinou commented Dec 9, 2025

Copy link
Copy Markdown
Member

Does the undo issue also happen when you drag a file from FileSystem?

Yes; I guess it should be fixed in a separate PR then.

@KoBeWi KoBeWi modified the milestones: 4.x, 4.7 Dec 9, 2025
@Repiteo
Repiteo merged commit 98b40fa into godotengine:master Jan 27, 2026
20 checks passed
@Repiteo

Repiteo commented Jan 27, 2026

Copy link
Copy Markdown
Contributor

Thanks!

@KoBeWi
KoBeWi deleted the shadragger branch January 27, 2026 21:33
rivie13 pushed a commit to rivie13/Phoenix-Agentic-Engine that referenced this pull request Feb 16, 2026
Allow dragging from shader editor to material
BendyLand pushed a commit to BendyLand/voltaire that referenced this pull request Aug 2, 2026
Allow dragging from shader editor to material
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Allow dragging shader file from shader editor to shader material

4 participants