From 39c662269783fd5934404f1dcc5e51552ecaa981 Mon Sep 17 00:00:00 2001 From: Wil Shipley Date: Tue, 5 May 2015 15:42:01 -0700 Subject: [PATCH] - Added a generic renderToImage() function to SCNRenderer, so we can share with StackOverflow / Goossens. --- workspaces/xcode6/Assimp.xcodeproj/project.pbxproj | 7 ++++++- .../xcshareddata/xcschemes/assimp.xcscheme | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/workspaces/xcode6/Assimp.xcodeproj/project.pbxproj b/workspaces/xcode6/Assimp.xcodeproj/project.pbxproj index 0fe168f9f..7773fe7bb 100644 --- a/workspaces/xcode6/Assimp.xcodeproj/project.pbxproj +++ b/workspaces/xcode6/Assimp.xcodeproj/project.pbxproj @@ -1467,7 +1467,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0640; TargetAttributes = { 7F79227F1AB43AC3005A8E5D = { CreatedOnToolsVersion = 6.3; @@ -1699,6 +1699,7 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 3.0.0; @@ -1745,6 +1746,7 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 3.0.0; @@ -1790,6 +1792,7 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 3.0.0; @@ -1834,6 +1837,7 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 3.0.0; @@ -1876,6 +1880,7 @@ buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; MACH_O_TYPE = staticlib; + ONLY_ACTIVE_ARCH = YES; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; }; name = Debug; diff --git a/workspaces/xcode6/Assimp.xcodeproj/xcshareddata/xcschemes/assimp.xcscheme b/workspaces/xcode6/Assimp.xcodeproj/xcshareddata/xcschemes/assimp.xcscheme index e74918baf..1786e9197 100644 --- a/workspaces/xcode6/Assimp.xcodeproj/xcshareddata/xcschemes/assimp.xcscheme +++ b/workspaces/xcode6/Assimp.xcodeproj/xcshareddata/xcschemes/assimp.xcscheme @@ -1,6 +1,6 @@