project update

CLOUDS-Interactive-Documentary · Jul 9, 2016 · ee03bf0 · ee03bf0
1 parent 37ce755
commit ee03bf0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CLOUDS/CLOUDS.xcodeproj/project.pbxproj b/CLOUDS/CLOUDS.xcodeproj/project.pbxproj
@@ -16213,6 +16213,7 @@
 			baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CODE_SIGN_IDENTITY = "Developer ID Application: Serious Computational Cinema LLC (Z658858QS8)";
 				CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/";
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = YES;
@@ -16242,7 +16243,7 @@
 					"$(OF_PATH)/addons/ofxOsc/libs/oscpack/src",
 					"$(OF_PATH)/addons/ofxOculusDK2/libs/**",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				OTHER_CPLUSPLUSFLAGS = (
 					"-D__MACOSX_CORE__",
 					"-lpthread",
@@ -16258,6 +16259,7 @@
 			baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CODE_SIGN_IDENTITY = "Developer ID Application: Serious Computational Cinema LLC (Z658858QS8)";
 				CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/";
 				COPY_PHASE_STRIP = YES;
 				DEAD_CODE_STRIPPING = YES;
@@ -16288,7 +16290,7 @@
 					"$(OF_PATH)/addons/ofxOsc/libs/oscpack/src",
 					"$(OF_PATH)/addons/ofxOculusDK2/libs/**",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				OTHER_CPLUSPLUSFLAGS = (
 					"-D__MACOSX_CORE__",
 					"-lpthread",

diff --git a/CloudsLibrary/src/RGBD/CloudsVisualSystemRGBD.cpp b/CloudsLibrary/src/RGBD/CloudsVisualSystemRGBD.cpp
@@ -1380,7 +1380,7 @@ void CloudsVisualSystemRGBD::updateTransition(float percentComplete)
 	if(transitioning) {
 		float easedPercent = ofxTween::map(percentComplete, 0, 1, 0, 1, true, ofxEasingCubic(), transitionEase );//ofxEasingSine
 		cloudsCamera.setTransitionPercent( easedPercent );
-		if(selectedPortal != nullptr){
+		if(selectedPortal != NULL){
 			playerScaleModifier = powf(ofMap(percentComplete,0,.8,1.0,0.0,true),2.0);
 		}
 		else{