diff --git a/examples/all/all_experimental.odin b/examples/all/all_experimental.odin index 9679e0ca4..cd60c269c 100644 --- a/examples/all/all_experimental.odin +++ b/examples/all/all_experimental.odin @@ -3,8 +3,6 @@ package all import c_tokenizer "core:c/frontend/tokenizer" import c_preprocessor "core:c/frontend/preprocessor" -import virtual "core:mem/virtual" _ :: c_tokenizer _ :: c_preprocessor -_ :: virtual diff --git a/vendor/fontstash/fontstash.odin b/vendor/fontstash/fontstash.odin index 93a48bc0d..edf9e12db 100644 --- a/vendor/fontstash/fontstash.odin +++ b/vendor/fontstash/fontstash.odin @@ -1067,7 +1067,7 @@ TextIterNext :: proc( iter.x = iter.nextx iter.y = iter.nexty iter.codepointCount += 1 - if glyph, ok := __getGlyph(ctx, iter.font, iter.codepoint, iter.isize, iter.iblur); ok { + if glyph, glyph_ok := __getGlyph(ctx, iter.font, iter.codepoint, iter.isize, iter.iblur); glyph_ok { __getQuad(ctx, iter.font, iter.previousGlyphIndex, glyph, iter.scale, iter.spacing, &iter.nextx, &iter.nexty, quad) iter.previousGlyphIndex = glyph.index } else { diff --git a/vendor/nanovg/nanovg.odin b/vendor/nanovg/nanovg.odin index 6b06e3534..8d30a407d 100644 --- a/vendor/nanovg/nanovg.odin +++ b/vendor/nanovg/nanovg.odin @@ -916,8 +916,8 @@ CreateImageMem :: proc(ctx: ^Context, data: []byte, imageFlags: ImageFlags) -> i return 0 } - data := img[:int(w) * int(h) * int(n)] - image := CreateImageRGBA(ctx, int(w), int(h), imageFlags, data) + pixel_data := img[:int(w) * int(h) * int(n)] + image := CreateImageRGBA(ctx, int(w), int(h), imageFlags, pixel_data) stbi.image_free(img) return image }