Skip to content

Sync a few templates with upstream Godot - #2039

Merged
dsnopek merged 1 commit into
godotengine:masterfrom
Togira123:sync_templates
Aug 11, 2026
Merged

Sync a few templates with upstream Godot#2039
dsnopek merged 1 commit into
godotengine:masterfrom
Togira123:sync_templates

Conversation

@Togira123

Copy link
Copy Markdown
Contributor

This syncs a few classes in the templates folder with godot upstream. Done by copy-pasting the code from upstream, then resolving the diffs. It looks like hashfuncs.cpp is the first .cpp file for templates, so had to also edit the godotcpp.py tool to include it in compilation. Also renamed sort_list.h to sort_list.hpp to match the other files. I will likely do a bunch more since there are more left but I thought I'd open a PR now since it is already a considerable number of changes.

@Togira123
Togira123 requested a review from a team as a code owner July 31, 2026 22:01
@dsnopek
dsnopek requested a review from Ivorforce August 1, 2026 11:00
@dsnopek dsnopek added the enhancement This is an enhancement on the current functionality label Aug 1, 2026
@dsnopek dsnopek added this to the 10.x milestone Aug 1, 2026

@Ivorforce Ivorforce 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.

Looks mostly good! Just the hashfuncs change is problematic.

Comment thread include/godot_cpp/templates/hashfuncs.hpp
Comment thread include/godot_cpp/templates/hashfuncs.hpp Outdated
Comment thread include/godot_cpp/templates/hashfuncs.hpp Outdated
Comment thread include/godot_cpp/templates/hashfuncs.hpp Outdated
@Togira123
Togira123 force-pushed the sync_templates branch 2 times, most recently from 3b3f067 to aa9681b Compare August 6, 2026 12:18

@Ivorforce Ivorforce 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.

Looks clean now. Thanks for your effort!

@dsnopek
dsnopek merged commit 8a83a77 into godotengine:master Aug 11, 2026
20 checks passed
@dsnopek

dsnopek commented Aug 11, 2026

Copy link
Copy Markdown
Collaborator

Thanks!

@Togira123
Togira123 deleted the sync_templates branch August 11, 2026 21:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement This is an enhancement on the current functionality

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants