Skip to content

Commit 9298f94

Browse files
authored
Merge pull request #96 from adriengivry/fix/textureid_typo
Fixing TextureID typo (d renamed to id)
2 parents a642304 + 1a96258 commit 9298f94

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

Sources/Overload/OvCore/src/OvCore/Helpers/GUIDrawer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ OvUI::Widgets::Visual::Image& OvCore::Helpers::GUIDrawer::DrawTexture(OvUI::Inte
155155
if (auto resource = OVSERVICE(OvCore::ResourceManagement::TextureManager).GetResource(p_receivedData.first); resource)
156156
{
157157
p_data = resource;
158-
widget.textureID.d = resource->id;
158+
widget.textureID.id = resource->id;
159159
if (p_updateNotifier)
160160
p_updateNotifier->Invoke();
161161
}
@@ -169,7 +169,7 @@ OvUI::Widgets::Visual::Image& OvCore::Helpers::GUIDrawer::DrawTexture(OvUI::Inte
169169
resetButton.ClickedEvent += [&widget, &p_data, p_updateNotifier]
170170
{
171171
p_data = nullptr;
172-
widget.textureID.d = (__EMPTY_TEXTURE ? __EMPTY_TEXTURE->id : 0);
172+
widget.textureID.id = (__EMPTY_TEXTURE ? __EMPTY_TEXTURE->id : 0);
173173
if (p_updateNotifier)
174174
p_updateNotifier->Invoke();
175175
};

Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class TexturePreview : public OvUI::Plugins::IPlugin
9393
if (ImGui::IsItemHovered())
9494
{
9595
if (texture)
96-
image.textureID.d = texture->id;
96+
image.textureID.id = texture->id;
9797

9898
ImGui::BeginTooltip();
9999
image.Draw();

Sources/Overload/OvUI/include/OvUI/Internal/TextureID.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace OvUI::Internal
1515
*/
1616
union TextureID
1717
{
18-
uint32_t d;
18+
uint32_t id;
1919
void* raw;
2020
};
2121
}

0 commit comments

Comments
 (0)