Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add samplerExternalOES type to shader globals #99622

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Add samplerExternalOES type to shader globals #99622

merged 1 commit into from
Dec 11, 2024

Conversation

Chaosus
Copy link
Member

@Chaosus Chaosus commented Nov 24, 2024 •
edited
Loading

@Chaosus Chaosus requested a review from a team as a code owner November 24, 2024 11:19
@Chaosus Chaosus added this to the 4.4 milestone Nov 24, 2024
@Chaosus Chaosus force-pushed the shader_fix_global_empty_type branch 3 times, most recently from 1e66723 to 85bf05a Compare November 24, 2024 11:31
@Chaosus Chaosus requested review from a team as code owners November 24, 2024 11:31
@Chaosus Chaosus force-pushed the shader_fix_global_empty_type branch from 85bf05a to 7ecdfc8 Compare November 24, 2024 11:33
@Chaosus Chaosus changed the title Fix empty type option in Shader Globals editor Add samplerExternalOES type to shader globals Nov 24, 2024
Calinou
Calinou approved these changes Dec 11, 2024
View reviewed changes
Copy link
Member

@Calinou Calinou left a comment

Choose a reason for hiding this comment

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

Tested locally, it works as expected.

image

@Repiteo Repiteo merged commit b773fff into godotengine:master Dec 11, 2024
20 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Dec 11, 2024

Thanks!

@Chaosus Chaosus deleted the shader_fix_global_empty_type branch December 12, 2024 07:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Calinou Calinou Calinou approved these changes

Assignees
No one assigned
Labels
bug enhancement topic:editor topic:shaders
Projects
None yet
Milestone
4.4
Development

Successfully merging this pull request may close these issues.

Empty type option in Shader Globals editor
3 participants
@Chaosus @Repiteo @Calinou