Merge branch 'master' into compatibility

13 years ago · 2cc44bec5d
3 changed files with 8 additions and 4 deletions
--- a/src/Platform/NaClApplication.h
+++ b/src/Platform/NaClApplication.h
@ -83,13 +83,14 @@ your NaCl toolchain.
 <html>
 <head>
 <title>Magnum NaCl Application</title>
+<meta charset="utf-8" />
 <link rel="stylesheet" href="NaClApplication.css" />
 </head>
 <body>
 <h1>Magnum NaCl Application</h1>
 <div id="listener">
 <script type="text/javascript" src="NaClApplication.js"></script>
-<embed name="nacl" id="module" type="application/x-nacl" src="application.nmf" />
+<embed id="module" type="application/x-nacl" src="application.nmf" />
 <div id="status">Initialization...</div>
 <div id="statusDescription"></div>
 </div>
--- a/src/Platform/magnum-info-nacl.html
+++ b/src/Platform/magnum-info-nacl.html
@ -2,6 +2,7 @@
 <html>
 <head>
 <title>Magnum Info</title>
+<meta charset="utf-8" />
 <link rel="stylesheet" href="NaClApplication.css" />
 <style type="text/css">
 #module {
@ -31,7 +32,7 @@ function messageReceived(message) {
 var listener = document.getElementById('listener');
 listener.addEventListener('message', messageReceived, true);
 </script>
-<embed name="nacl" id="module" type="application/x-nacl" src="magnum-info.nmf" />
+<embed id="module" type="application/x-nacl" src="magnum-info.nmf" />
 <div id="status">Initialization...</div>
 <div id="statusDescription"></div>
 <div id="info"></div>
--- a/src/Shaders/MeshVisualizer.h
+++ b/src/Shaders/MeshVisualizer.h
@ -125,10 +125,12 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizer: public AbstractShaderProgram {
         * @brief Set viewport size
         * @return Reference to self (for method chaining)
         *
-         * Has effect only if @ref Flag "Flag::Wireframe" is enabled.
+         * Has effect only if @ref Flag "Flag::Wireframe" is enabled and
+         * geometry shaders are used.
         */
        MeshVisualizer& setViewportSize(const Vector2& size) {
-            setUniform(viewportSizeUniform, size);
+            if(flags & Flag::Wireframe && !(flags & Flag::NoGeometryShader))
+                setUniform(viewportSizeUniform, size);
            return *this;
        }