Merge branch 'master' of github.com:nodebox/nodebox-opengl

Conflicts:
	examples/12-experimental/04-live1.py
	examples/12-experimental/04-live2.py

Author: Tom De Smedt

examples/12-experimental/04-live1.py

@@ -1,14 +1,21 @@
 # Add the upper directory (where the nodebox module is) to the search path.
 import os, sys; sys.path.insert(0, os.path.join("..", ".."))
+<<<<<<< HEAD
 import warnings
+=======
+>>>>>>> 2dde5a7eb4a0f379e8d2476487011bdacba7e165
 
 from nodebox.graphics import *
 
 # Live coding example.
 # The actual drawing code is in 04-live2.py.
 # This script starts the canvas and executes the commands from 04-live2.py.
+<<<<<<< HEAD
 # You can then edit and save the code there,
 # changes will be reflected automatically while the canvas keeps running.
+=======
+# You can then edit and save the code there, changes will be reflected automatically.
+>>>>>>> 2dde5a7eb4a0f379e8d2476487011bdacba7e165
 
 SCRIPT = "04-live2.py"
 source = open(SCRIPT).read()
@@ -17,10 +24,14 @@
 def draw(canvas):
     global source
     global modified
+<<<<<<< HEAD
     try:
         exec(source)
     except Exception, e:
         warnings.warn(str(e), Warning)
+=======
+    exec(source)
+>>>>>>> 2dde5a7eb4a0f379e8d2476487011bdacba7e165
     if os.path.getmtime(SCRIPT) > modified:
         source = open(SCRIPT).read()
         modified = os.path.getmtime(SCRIPT)

examples/12-experimental/04-live2.py

@@ -1,8 +1,14 @@
+<<<<<<< HEAD
 # Live coding example.
 # See 04-live1.py.
 # The commands below are read and executed in a canvas there.
 # If you edit and save this file, changes are automatically reflected,
 # while the canvas started in 04-live1.py keeps on running.
+=======
+# See 04-live1.py.
+# The commands below are read and executed in a canvas there.
+# If you edit and save this file, changes are automatically reflected.
+>>>>>>> 2dde5a7eb4a0f379e8d2476487011bdacba7e165
 
 #canvas.clear()
 for i in range(10):
@@ -11,4 +17,8 @@
     r = random(20) + 50
     fill(random(), 0.0, random(0.25), random(0.25))
     stroke(0, 0.2)
-    ellipse(x, y, random, r)
+<<<<<<< HEAD
+    ellipse(x, y, random, r)
+=======
+    ellipse(x, y, r, r)
+>>>>>>> 2dde5a7eb4a0f379e8d2476487011bdacba7e165