interim checkin

humbletim committed 8 years ago

Commit 5791ca41 parent 145a0df27 files · +557 −119Browse files

Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 27 files). Show all

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+2−1

@@ -2448,7 +2448,8 @@ graphics::MeshPointer GeometryCache::meshFromShape(Shape geometryShape, glm::vec · 2447 unmodified lines
2448	2448	auto partBuffer = new gpu::Buffer(sizeof(graphics::Mesh::Part), (gpu::Byte*)&part);
2449	2449	mesh->setPartBuffer(gpu::BufferView(partBuffer, gpu::Element::PART_DRAWCALL));
2450	2450
2451		− mesh->displayName = QString("GeometryCache/shape::%1").arg(GeometryCache::stringFromShape(geometryShape));
	2451	+ mesh->modelName = GeometryCache::stringFromShape(geometryShape).toStdString();
	2452	+ mesh->displayName = QString("GeometryCache/shape::%1").arg(GeometryCache::stringFromShape(geometryShape)).toStdString();
2452	2453
2453	2454	return mesh;
2454	2455	}