Skip to content

Cherry-picks for the godot-cpp 4.2 branch - 1st batch#1372

Merged
dsnopek merged 11 commits into
godotengine:4.2from
dsnopek:4.2-cherrypicks-1
Feb 16, 2024
Merged

Cherry-picks for the godot-cpp 4.2 branch - 1st batch#1372
dsnopek merged 11 commits into
godotengine:4.2from
dsnopek:4.2-cherrypicks-1

Conversation

@dsnopek

@dsnopek dsnopek commented Jan 22, 2024

Copy link
Copy Markdown
Collaborator

The 1st batch of PR's marked with cherrypick:4.2

@AThousandShips

Copy link
Copy Markdown
Member

See discussion on:

I'd hold off cherry picking this, if at all (also for 4.1)

@dsnopek

dsnopek commented Jan 23, 2024

Copy link
Copy Markdown
Collaborator Author

I'd hold off cherry picking this, if at all (also for 4.1)

We can hold off while figuring out the issue with SAFE_NUMERIC_TYPE_PUN_GUARANTEES(uint64_t), however, I'd really like to cherry-pick this eventually. Without this change, GDExtensions compiled with the 4.1 or 4.2 versions of godot-cpp will be subtly incompatible with Godot 4.3+ if they get a packed array or string with enough elements. And developers may choose to build their extension with the 4.1 or 4.2 version of godot-cpp to make it compatible with more versions of Godot.

@AThousandShips

Copy link
Copy Markdown
Member

I'd suggest just removing it from this and not hold this batch back, will do some further looking into that bug but been having problems testing 32 bit builds, but will look back into it

@dsnopek

dsnopek commented Jan 24, 2024

Copy link
Copy Markdown
Collaborator Author

Ok, I've removed the cherry-pick of PR #1357 for now

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

LGTM (but made a few of these so a second opinion would be good too)

@dsnopek
dsnopek merged commit 51c752c into godotengine:4.2 Feb 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants