AddRef() - Fix for compailation failed case. (#1989)

* AddRef() - Fix for compailation failed case. * Revert .shaders version 2 -> 1 * Quieter * Fixes for Shader Compilation failures * Changes per PR review. * Fix for Data/File mix permutations
pxscene · Aug 9, 2019 · c754542 · c754542
1 parent 9bb696d
commit c754542
Show file tree

Hide file tree

Showing 3 changed files with 198 additions and 185 deletions.
diff --git a/examples/pxScene2d/src/pxResource.cpp b/examples/pxScene2d/src/pxResource.cpp
@@ -858,7 +858,7 @@ void pxResource::processDownloadedResource(rtFileDownloadRequest* fileDownloadRe
       setLoadStatus("httpStatusCode",(uint32_t)fileDownloadRequest->httpStatusCode());
       if (gUIThreadQueue)
       {
-        gUIThreadQueue->addTask(pxResource::onDownloadCanceledUI, this, (void*)"reject");
+        gUIThreadQueue->addTask(onDownloadCanceledUI, this, (void*)"reject");
       }
     }
     else if (fileDownloadRequest->downloadStatusCode() == 0 &&
@@ -901,7 +901,7 @@ void pxResource::processDownloadedResource(rtFileDownloadRequest* fileDownloadRe
         // TODO review overall flow and organization
         if (gUIThreadQueue)
         {
-          gUIThreadQueue->addTask(pxResource::onDownloadCompleteUI, this, (void*)"reject");
+          gUIThreadQueue->addTask(onDownloadCompleteUI, this, (void*)"reject");
         }
       }
       else if (result == PX_RESOURCE_LOAD_SUCCESS)
@@ -916,7 +916,7 @@ void pxResource::processDownloadedResource(rtFileDownloadRequest* fileDownloadRe
         // TODO review overall flow and organization
         if (gUIThreadQueue)
         {
-          gUIThreadQueue->addTask(pxResource::onDownloadCompleteUI, this, (void*)"resolve");
+          gUIThreadQueue->addTask(onDownloadCompleteUI, this, (void*)"resolve");
         }
       }
     }
@@ -933,7 +933,7 @@ void pxResource::processDownloadedResource(rtFileDownloadRequest* fileDownloadRe
       // TODO review overall flow and organization
       if (gUIThreadQueue)
       {
-        gUIThreadQueue->addTask(pxResource::onDownloadCompleteUI, this, (void*)"reject");
+        gUIThreadQueue->addTask(onDownloadCompleteUI, this, (void*)"reject");
       }
     }
   }