Merge branch 'master' into linux

make-oneshot-mac.command

@@ -4,7 +4,7 @@ set -e
 cd `dirname $0`
 
 # User-configurable variables
-mac_version="1.0.2"
+mac_version="1.0.4"
 make_threads=8
 ONESHOT_PATH=$HOME/Library/Application\ Support/Steam/steamapps/common/OneShot
 

patches/mac/Info.plist.in

@@ -19,7 +19,7 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleVersion</key>
-		<string>macOS Port v.ONESHOTMACVERSION (OneShot Solstice Update)</string>
+		<string>macOS Port v.ONESHOTMACVERSION</string>
 		<key>CFBundleShortVersionString</key>
 		<string>ONESHOTMACVERSION</string>
 		<key>LSApplicationCategoryType</key>

src/graphics.cpp

@@ -743,6 +743,9 @@ void Graphics::transition(int duration,
 
 	setBrightness(255);
 
+	/* Capture new scene */
+	p->screen.composite();
+
 	/* The PP frontbuffer will hold the current scene after the
 	 * composition step. Since the backbuffer is unused during
 	 * the transition, we can reuse it as the target buffer for
@@ -750,9 +753,6 @@ void Graphics::transition(int duration,
 	TEXFBO &currentScene = p->screen.getPP().frontBuffer();
 	TEXFBO &transBuffer  = p->screen.getPP().backBuffer();
 
-	/* Capture new scene */
-	p->screen.composite();
-
 	/* If no transition bitmap is provided,
 	 * we can use a simplified shader */
 	TransShader &transShader = shState->shaders().trans;