Merge branch 'master' of https://github.com/paperjs/paper.js

* 'master' of https://github.com/paperjs/paper.js:
  Explicitly use bash to avoid build problems on linux.
  Bump version number to 0.9.2
  Fix exporting of Base, Numerical and PaperScript into PaperScope.

build/build.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Paper.js - The Swiss Army Knife of Vector Graphics Scripting.
 # http://paperjs.org/

build/dist.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Paper.js - The Swiss Army Knife of Vector Graphics Scripting.
 # http://paperjs.org/

build/docs.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Paper.js - The Swiss Army Knife of Vector Graphics Scripting.
 # http://paperjs.org/

build/load.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Paper.js - The Swiss Army Knife of Vector Graphics Scripting.
 # http://paperjs.org/

build/minify-lib.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Paper.js - The Swiss Army Knife of Vector Graphics Scripting.
 # http://paperjs.org/

build/minify.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Paper.js - The Swiss Army Knife of Vector Graphics Scripting.
 # http://paperjs.org/

build/preprocess.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Paper.js - The Swiss Army Knife of Vector Graphics Scripting.
 # http://paperjs.org/

build/zip.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Paper.js - The Swiss Army Knife of Vector Graphics Scripting.
 # http://paperjs.org/

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "paper",
-	"version": "0.9.1",
+	"version": "0.9.2",
 	"main": "./src/node/index.js",
 	"engines": { "node": ">= 0.4.0" },
 	"dependencies": {

src/core/Base.js

@@ -81,8 +81,7 @@ Base.inject(/** @lends Base# */{
 	statics: /** @lends Base */{
 
 		// Keep track of all named classes for serialization and exporting.
-		// Also register the Base class itself.
-		exports: new Base({ Base: Base }),
+		exports: new Base(),
 
 		extend: function extend(src) {
 			// Override Base.extend() to register named classes in Base.exports,

src/export.js

@@ -10,9 +10,12 @@
  * All rights reserved.
  */
 
-// Add PaperScript and Numerical to exports, inject all exports into PaperScope,
-// and create the initial paper object, all in one condensed statement:
+// First add Base, PaperScript and Numerical to exports, then inject all exports
+// into PaperScope, and create the initial paper object, all in one statement:
 paper = new (PaperScope.inject(Base.exports.inject({
+	// Mark fields as enumeralbe so PaperScope.inject can pick them up
+	enumerable: true,
+	Base: Base,
 	PaperScript: PaperScript,
 	Numerical: Numerical
 })))();