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

Fixed mesh data access errors in GLES2 #40235

Merged
merged 1 commit into from
Jul 9, 2020
Merged

Fixed mesh data access errors in GLES2 #40235

merged 1 commit into from
Jul 9, 2020

Conversation

pouleyKetchoupp
Copy link
Contributor

  1. Removed error in mesh_surface_get_array as it's supported now
    (see Fix crash on trimesh_create  #34794 (comment))

  2. More accurate error message in mesh_surface_get_blend_shapes

@pouleyKetchoupp
Fixed mesh data access errors in GLES2
e19a3df 
1. Removed errors in mesh_surface_get_array as it's supported now
2. More accurate errors in mesh_surface_get_blend_shapes
@pouleyKetchoupp pouleyKetchoupp added bug topic:rendering cherrypick:3.x Considered for cherry-picking into a future 3.x release labels Jul 9, 2020
@pouleyKetchoupp pouleyKetchoupp added this to the 4.0 milestone Jul 9, 2020
@pouleyKetchoupp pouleyKetchoupp requested a review from reduz as a code owner July 9, 2020 12:04
@lawnjelly
Copy link
Member

Looks fine to me. 👍

@akien-mga akien-mga merged commit 006bb33 into godotengine:master Jul 9, 2020
@akien-mga
Copy link
Member

Thanks!

Note that for GLES2/GLES3, you can PR to the 3.2 branch directly, as the GLES2 code in master is unmaintained. Once we'll start reimplementing it, it would be copied from the more advanced 3.2 branch (I'm just keeping it in tree to avoid a big removal and then big re-add of partially overlapping code, though maybe it's not so meaningful).

@pouleyKetchoupp pouleyKetchoupp deleted the gles2-errors-mesh-data branch July 9, 2020 12:47
@akien-mga
Copy link
Member

Cherry-picked for 3.2.3.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Jul 9, 2020
@pouleyKetchoupp pouleyKetchoupp mentioned this pull request Jul 10, 2020
Closed
@neauangle neauangle mentioned this pull request Sep 3, 2020
Closed
@westtunger westtunger mentioned this pull request Sep 3, 2020
Closed
@lawnjelly lawnjelly mentioned this pull request May 2, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clayjohn clayjohn Awaiting requested review from clayjohn

@lawnjelly lawnjelly Awaiting requested review from lawnjelly

@reduz reduz Awaiting requested review from reduz

Assignees
No one assigned
Labels
bug topic:rendering
Projects
None yet
Milestone
4.0
Development

Successfully merging this pull request may close these issues.
3 participants
@pouleyKetchoupp @lawnjelly @akien-mga