@@ -358,7 +358,7 @@ namespace BansheeEditor
void EditorApplication::closeModalWindow(RenderWindowPtr window, CM::HSceneObject sceneObject)
{
- sceneObject->destroy();
+ //sceneObject->destroy();
window->destroy();
}
@@ -1294,6 +1294,9 @@ namespace BansheeEngine
Vector2I GUIManager::getWidgetRelativePos(const GUIWidget& widget, const Vector2I& screenPos) const
const RenderWindow* window = getWidgetWindow(widget);
+ if(window == nullptr)
+ return Vector2I();
+
Vector2I windowPos = window->screenToWindowPos(screenPos);
windowPos = windowToBridgedCoords(widget, windowPos);
@@ -281,7 +281,8 @@ namespace CamelotFramework {
THROW_IF_NOT_CORE_THREAD;
- target->swapBuffers();
+ if(target->isInitialized())
+ target->swapBuffers();
void RenderSystem::writeSubresource(GpuResourcePtr resource, UINT32 subresourceIdx, const GpuResourceDataPtr& data, bool discardEntireBuffer, AsyncOp& asyncOp)