diff options
| author | callum_linden <none@none> | 2016-05-31 09:41:37 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-31 09:41:37 -0700 |
| commit | dca6153c236dbd81f3f0c23b449136452f7d7ef9 (patch) | |
| tree | 900168105d495d959960886b44bb962d35569717 | |
| parent | 282956e7688169e539059385962cbd6a295255f6 (diff) | |
Remove local flip (as part of resize) in QuickTime plugin for OSX
| -rwxr-xr-x | indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index ff1ed8bfbc..011fd4e051 100755 --- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp @@ -311,7 +311,9 @@ private: MatrixRecord transform; SetIdentityMatrix( &transform ); // transforms are additive so start from identify matrix double scaleX = (double) mWidth / mNaturalWidth; - double scaleY = -1.0 * (double) mHeight / mNaturalHeight; + + // 2016-05-31 CP remove local flip (via -1.0) since texture coods for media on a prim are now flipped for VLC/CEF + double scaleY = 1.0 * (double) mHeight / mNaturalHeight; double centerX = mWidth / 2.0; double centerY = mHeight / 2.0; ScaleMatrix( &transform, X2Fix( scaleX ), X2Fix( scaleY ), X2Fix( centerX ), X2Fix( centerY ) ); |