From 36940b4dfe1fabcbc4e00932b76271795653b3a7 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 10 Apr 2017 09:11:23 -0700
Subject: [PATCH] revert commit that broke sendToScript

---
 libraries/gl/src/gl/OffscreenGLCanvas.cpp   | 2 --
 libraries/gl/src/gl/OffscreenQmlSurface.cpp | 6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/libraries/gl/src/gl/OffscreenGLCanvas.cpp b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
index e5c630d97e..3f1d629638 100644
--- a/libraries/gl/src/gl/OffscreenGLCanvas.cpp
+++ b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
@@ -59,8 +59,6 @@ bool OffscreenGLCanvas::create(QOpenGLContext* sharedContext) {
 
 bool OffscreenGLCanvas::makeCurrent() {
     bool result = _context->makeCurrent(_offscreenSurface);
-    Q_ASSERT(result);
-
     std::call_once(_reportOnce, [this]{
         qCDebug(glLogging) << "GL Version: " << QString((const char*) glGetString(GL_VERSION));
         qCDebug(glLogging) << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION));
diff --git a/libraries/gl/src/gl/OffscreenQmlSurface.cpp b/libraries/gl/src/gl/OffscreenQmlSurface.cpp
index 16e32ab42e..3bbd26e010 100644
--- a/libraries/gl/src/gl/OffscreenQmlSurface.cpp
+++ b/libraries/gl/src/gl/OffscreenQmlSurface.cpp
@@ -612,11 +612,7 @@ QObject* OffscreenQmlSurface::finishQmlLoad(std::function<void(QQmlContext*, QOb
         return nullptr;
     }
 
-    //check if the item contains sendToScript signal
-    int sendToScriptIndex = newItem->metaObject()->indexOfSignal("sendToScript");
-    if (sendToScriptIndex != -1) {
-        connect(newItem, SIGNAL(sendToScript(QVariant)), this, SIGNAL(fromQml(QVariant)));
-    }
+    connect(newItem, SIGNAL(sendToScript(QVariant)), this, SIGNAL(fromQml(QVariant)));
 
     // The root item is ready. Associate it with the window.
     _rootItem = newItem;