Merge pull request #765 from dictoon/master

Miscellaneous small changes
appleseedhq · Jun 15, 2015 · e1f98d1 · e1f98d1
2 parents c8adf41 + 5943664
commit e1f98d1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/sandbox/tests/test scenes/osl/ref/08 - point velocity.png b/sandbox/tests/test scenes/osl/ref/08 - point velocity.png
diff --git a/sandbox/tests/test scenes/osl/ref/13 - point velocity moving assembly.png b/sandbox/tests/test scenes/osl/ref/13 - point velocity moving assembly.png
diff --git a/scripts/appleseed.package.configuration.sample.xml b/scripts/appleseed.package.configuration.sample.xml
@@ -7,13 +7,13 @@
          Valid values for this parameter are: linux-gcc4, mac-gcc4 and win-vs100.
          For the definitive list of accepted values, see the name of the configuration
          files in src/cmake/config/. -->
-    <platform_id>win-vs110</platform_id>
+    <platform_id>win-vs120</platform_id>
 
     <!-- The name of the target platform. May differ from the platform ID, e.g. to indicate
          if the build is a 32-bit or 64-bit variant. This parameter is only used to name
          the final archive file. Example values: win32-vs100, win64-vs100, linux64-gcc4,
          mac64-gcc4, etc. -->
-    <platform_name>win64-vs110</platform_name>
+    <platform_name>win64-vs120</platform_name>
 
     <!-- The path to the appleseed installation where binaries files will be taken from. -->
     <appleseed_path>C:\appleseed</appleseed_path>
@@ -25,8 +25,8 @@
     <package_output_path>C:\appleseed\archives\releases</package_output_path>
 
     <!-- The path to the Qt shared libraries. -->
-    <qt_runtime_path>C:\qt-4.8.2\lib</qt_runtime_path>
+    <qt_runtime_path>C:\qt-everywhere-opensource-src-4.8.6\lib</qt_runtime_path>
 
     <!-- The path to the platform runtime files (Windows only). -->
-    <platform_runtime_path>C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x86\Microsoft.VC100.CRT</platform_runtime_path>
+    <platform_runtime_path>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT</platform_runtime_path>
 </configuration>
diff --git a/src/appleseed.shared/application/commandlinehandlerbase.cpp b/src/appleseed.shared/application/commandlinehandlerbase.cpp
@@ -232,7 +232,7 @@ void CommandLineHandlerBase::print_version_information(SuperLogger& logger) cons
         "compiled on %s at %s using %s version %s\n"
         "copyright (c) 2010-2013 Francois Beaune, Jupiter Jazz Limited.\n"
         "copyright (c) 2014-2015 The appleseedhq Organization.\n"
-        "this software is released under the MIT license (http://www.opensource.org/licenses/mit-license.php).\n"
+        "this software is released under the MIT license (http://opensource.org/licenses/MIT).\n"
         "visit http://appleseedhq.net/ for additional information and resources.",
         impl->m_application_name.c_str(),
         Appleseed::get_lib_name(),

diff --git a/src/appleseed.studio/help/about/aboutwindow.ui b/src/appleseed.studio/help/about/aboutwindow.ui
@@ -57,7 +57,7 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2010-2013 François Beaune, Jupiter Jazz Limited.&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2014-2015 The appleseedhq Organization.&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This software is released under the &lt;a href=&quot;http://www.opensource.org/licenses/mit-license.php&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#be8c32;&quot;&gt;MIT license&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This software is released under the &lt;a href=&quot;http://opensource.org/licenses/MIT&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#be8c32;&quot;&gt;MIT license&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Visit &lt;a href=&quot;http://appleseedhq.net/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#be8c32;&quot;&gt;http://appleseedhq.net/&lt;/span&gt;&lt;/a&gt; for additional information and resources.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>

diff --git a/src/appleseed/renderer/kernel/rendering/rendererservices.h b/src/appleseed/renderer/kernel/rendering/rendererservices.h
@@ -307,7 +307,7 @@ class RendererServices
     DECLARE_ATTR_GETTER(ray_ior);
     DECLARE_ATTR_GETTER(ray_has_differentials);
 
-    // Appleseed version attributes
+    // appleseed version attributes.
     DECLARE_ATTR_GETTER(appleseed_version_major);
     DECLARE_ATTR_GETTER(appleseed_version_minor);
     DECLARE_ATTR_GETTER(appleseed_version_patch);