Develop into master #9

Merged
SemvdH merged 126 commits from develop into main 2021-06-18 15:56:41 +00:00
Showing only changes of commit 504b97b320 - Show all commits

View File

@@ -41,16 +41,27 @@ namespace scene
}
gui::Button* ConvertGuiTextureToButton(gui::GuiTexture* texture) {
gui::Button* button;
if (texture != NULL)
{
if (texture->GetType() == gui::GuiType::BUTTON) {
gui::Button* button = (gui::Button*)texture;
button = (gui::Button*)texture;
return button;
}
else {
return NULL;
button = nullptr;
return button;
}
}
else {
button = nullptr;
return button;
}
}
/*gui::InteractableGui* ConvertGuiTextureToInteractableGui(gui::GuiTexture* texture) {
if (texture != NULL)