Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 810 vs 829 for /trunk/Source Code/Geometry/Material/Material.cpp

Diff revisions: vs.
  @@ -233,9 +233,8 @@
233 233 shaderDescriptor.setPropertyList(ss.str());
234 234 shaderDescriptor.setThreadedLoading(_shaderThreadedLoad);
235 235
236 - ShaderComputeQueue::ShaderQueueElement queueElement;
236 + ShaderComputeQueue::ShaderQueueElement queueElement(shaderDescriptor);
237 237 queueElement._shaderData = &_shaderInfo[stageIndex];
238 - queueElement._shaderDescriptor = shaderDescriptor;
239 238
240 239 ShaderComputeQueue& shaderQueue = _context.shaderComputeQueue();
241 240 if (computeOnAdd) {
  @@ -250,7 +249,7 @@
250 249 if (_dirty && _dumpToFile) {
251 250 updateTranslucency();
252 251 if (!Config::Build::IS_DEBUG_BUILD) {
253 - XML::dumpMaterial(_context, *this);
252 + //XML::dumpMaterial(_context, *this);
254 253 }
255 254 _dirty = false;
256 255 }