[overlay] Fix newMeshes to return proper modelIO meshes

Max Moiseev · Max Moiseev · commit ed553fd2571b · 2017-10-13T10:48:11.000-07:00
Fixes: &lt;rdar://problem/34624659&gt;
diff --git a/stdlib/public/SDK/MetalKit/MetalKit.swift b/stdlib/public/SDK/MetalKit/MetalKit.swift
@@ -16,10 +16,9 @@
 @available(macOS 10.11, iOS 9.0, tvOS 9.0, *)
 extension MTKMesh {
     public class func newMeshes(asset: MDLAsset, device: MTLDevice) throws -> (modelIOMeshes: [MDLMesh], metalKitMeshes: [MTKMesh]) {
-        var resultTuple : (modelIOMeshes: [MDLMesh], metalKitMeshes: [MTKMesh])
-        resultTuple.modelIOMeshes = [MDLMesh]()
-        resultTuple.metalKitMeshes = try MTKMesh.newMeshes(from: asset, device: device, sourceMeshes: AutoreleasingUnsafeMutablePointer<NSArray?>(&resultTuple.modelIOMeshes))
-        return resultTuple
+        var modelIOMeshes: NSArray?
+        var metalKitMeshes = try MTKMesh.newMeshes(from: asset, device: device, sourceMeshes: &modelIOMeshes)
+        return (modelIOMeshes: modelIOMeshes as! [MDLMesh], metalKitMeshes: metalKitMeshes)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,9 @@`
`16`	`16`	`@available(macOS 10.11, iOS 9.0, tvOS 9.0, *)`
`17`	`17`	`extension MTKMesh {`
`18`	`18`	`public class func newMeshes(asset: MDLAsset, device: MTLDevice) throws -> (modelIOMeshes: [MDLMesh], metalKitMeshes: [MTKMesh]) {`
`19`		`- var resultTuple : (modelIOMeshes: [MDLMesh], metalKitMeshes: [MTKMesh])`
`20`		`- resultTuple.modelIOMeshes = [MDLMesh]()`
`21`		`- resultTuple.metalKitMeshes = try MTKMesh.newMeshes(from: asset, device: device, sourceMeshes: AutoreleasingUnsafeMutablePointer<NSArray?>(&resultTuple.modelIOMeshes))`
`22`		`- return resultTuple`
	`19`	`+ var modelIOMeshes: NSArray?`
	`20`	`+ var metalKitMeshes = try MTKMesh.newMeshes(from: asset, device: device, sourceMeshes: &modelIOMeshes)`
	`21`	`+ return (modelIOMeshes: modelIOMeshes as! [MDLMesh], metalKitMeshes: metalKitMeshes)`
`23`	`22`	`}`
`24`	`23`	`}`
`25`	`24`