Fixed an issue where AsyncOps werent properly forwarded to some core thread methods

CamelotCore/Include/CmTextureRTTI.h

@@ -114,10 +114,8 @@ namespace CamelotFramework
 
 				GpuResourcePtr sharedTexPtr = std::static_pointer_cast<GpuResource>(texture->getThisPtr());
 
-				AsyncOp op;
-
 				pixelData->at(i)->lock();
-				gCoreThread().queueReturnCommand(boost::bind(&RenderSystem::writeSubresource, RenderSystem::instancePtr(), sharedTexPtr, subresourceIdx, pixelData->at(i), true, op));
+				gCoreThread().queueReturnCommand(boost::bind(&RenderSystem::writeSubresource, RenderSystem::instancePtr(), sharedTexPtr, subresourceIdx, pixelData->at(i), false, _1));
 			}
 
 			cm_delete<PoolAlloc>(pixelData);

CamelotCore/Source/CmCommandQueue.cpp

@@ -106,7 +106,8 @@ namespace CamelotFramework
 
 			if(command.returnsValue)
 			{
-				command.callbackWithReturnValue(*command.asyncOp);
+				AsyncOp& op = *command.asyncOp;
+				command.callbackWithReturnValue(op);
 
 				if(!command.asyncOp->hasCompleted())
 				{

CamelotCore/Source/CmTextureManager.cpp

@@ -58,6 +58,8 @@ namespace CamelotFramework
 		data->setColorAt(Color::Red, 1, 1);
 
 		AsyncOp op;
+
+		data->lock();
 		RenderSystem::instance().writeSubresource(mDummyTexture.getInternalPtr(), mDummyTexture->mapToSubresourceIdx(0, 0), data, false, op);
 	}
 

CamelotFontImporter/Source/CmFontImporter.cpp

@@ -272,7 +272,6 @@ namespace CamelotFramework
 				newTex.synchronize(); // TODO - Required due to a bug in allocateSubresourceBuffer
 
 				UINT32 subresourceIdx = newTex->mapToSubresourceIdx(0, 0);
-				AsyncOp op;
 
 				// It's possible the formats no longer match
 				if(newTex->getFormat() != pixelData->getFormat())
@@ -282,13 +281,13 @@ namespace CamelotFramework
 
 					temp->lock();
 					gCoreThread().queueReturnCommand(boost::bind(&RenderSystem::writeSubresource, 
-						RenderSystem::instancePtr(), newTex.getInternalPtr(), subresourceIdx, temp, true, op));
+						RenderSystem::instancePtr(), newTex.getInternalPtr(), subresourceIdx, temp, false, _1));
 				}
 				else
 				{
 					pixelData->lock();
 					gCoreThread().queueReturnCommand(boost::bind(&RenderSystem::writeSubresource, 
-						RenderSystem::instancePtr(), newTex.getInternalPtr(), subresourceIdx, pixelData, true, op));
+						RenderSystem::instancePtr(), newTex.getInternalPtr(), subresourceIdx, pixelData, false, _1));
 				}
 
 				fontData.texturePages.push_back(newTex);

CamelotFreeImgImporter/Source/CmFreeImgImporter.cpp

@@ -138,10 +138,8 @@ namespace CamelotFramework
 
 			imgData->getPixels(mip, *src);
 
-			AsyncOp op;
-
 			src->lock();
-			gCoreThread().queueReturnCommand(boost::bind(&RenderSystem::writeSubresource, RenderSystem::instancePtr(), newTexture, subresourceIdx, src, true, op));
+			gCoreThread().queueReturnCommand(boost::bind(&RenderSystem::writeSubresource, RenderSystem::instancePtr(), newTexture, subresourceIdx, src, false, _1));
 		}
 
 		fileData->close();