Merge branch 'development'

README.md

@@ -20,6 +20,7 @@ Useful links:
 			<li><a href="http://kovacsv.github.com/JSModeler/documentation/examples/legobuilder.html">Lego Builder</a> is an interactive lego builder application.</li>
 			<li><a href="http://kovacsv.github.com/JSModeler/documentation/examples/tictactoe.html">3D Tic-Tac-Toe</a> is a Tic-Tac-Toe game with 3D interface.</li>
 			<li><a href="http://kovacsv.github.com/JSModeler/documentation/examples/robot/robot.html">Robotic Arm</a> is a realtime robotic arm simulator.</li>
+			<li><a href="http://kovacsv.github.com/JSModeler/documentation/examples/csg.html">CSG Example</a> contains constructive solid geometry examples.</li>
 			<li><a href="http://kovacsv.github.com/JSModeler/documentation/examples/svgto3d.html">SVGTo3D</a> contains examples of using SVG to model converter.</li>
 			<li><a href="http://kovacsv.github.com/JSModeler/documentation/examples/deform.html">Deform</a> is a realtime polygon soft selection tool.</li>
 			<li><a href="http://kovacsv.github.com/JSModeler/documentation/examples/solids.html">Solid Body Viewer</a> is an example of using the SVG viewer.</li>

documentation/tutorial/svgto3d.html

@@ -17,8 +17,6 @@
 	<title>JSModeler SVG To 3D Tutorial</title>
 
 	<script type="text/javascript">
-		var viewer = null;
-
 		function Load ()
 		{
 			var viewerSettings = {
@@ -29,7 +27,7 @@
 				farClippingPlane : 100000.0
 			};
 
-			viewer = new JSM.Viewer ();
+			var viewer = new JSM.Viewer ();
 			if (!viewer.Start ('svgcanvas', viewerSettings)) {
 				viewer = null;
 				return;
@@ -103,7 +101,7 @@
 	farClippingPlane : 100000.0
 };
 
-viewer = new JSM.Viewer ();
+var viewer = new JSM.Viewer ();
 if (!viewer.Start ('svgcanvas', viewerSettings)) {
 	viewer = null;
 	return;

src/core/jsm.js

@@ -1,6 +1,6 @@
 var JSM = {
 	mainVersion : 0,
-	subVersion : 20
+	subVersion : 22
 };
 
 JSM.Eps = 0.00000001;