Skip to content

Commit 6b8accb

Browse files
committed
Fixed building when defining ImTextureID to a multi-token name. (#1641)
Amend 92b9498
1 parent 92b9498 commit 6b8accb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

imgui_draw.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ void ImDrawList::PushTextureID(ImTextureID texture_id)
619619
void ImDrawList::PopTextureID()
620620
{
621621
_TextureIdStack.pop_back();
622-
_CmdHeader.TextureId = (_TextureIdStack.Size == 0) ? ImTextureID() : _TextureIdStack.Data[_TextureIdStack.Size - 1];
622+
_CmdHeader.TextureId = (_TextureIdStack.Size == 0) ? (ImTextureID)NULL : _TextureIdStack.Data[_TextureIdStack.Size - 1];
623623
_OnChangedTextureID();
624624
}
625625

@@ -2777,7 +2777,7 @@ static bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas)
27772777
ImFontAtlasBuildInit(atlas);
27782778

27792779
// Clear atlas
2780-
atlas->TexID = ImTextureID();
2780+
atlas->TexID = (ImTextureID)NULL;
27812781
atlas->TexWidth = atlas->TexHeight = 0;
27822782
atlas->TexUvScale = ImVec2(0.0f, 0.0f);
27832783
atlas->TexUvWhitePixel = ImVec2(0.0f, 0.0f);

0 commit comments

Comments
 (0)