From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
Date: Tue, 3 Mar 2015 18:15:48 +0000 (-0500)
Subject: Merge tag '15.01-RC1' into upstream
X-Git-Tag: lulzbot-15.02.1-1.01~60
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=368e3d98cc195ee48b80672fe6074fe7f5d55a40;p=cura.git

Merge tag '15.01-RC1' into upstream

Conflicts:
	Cura/util/sliceEngine.py
---

368e3d98cc195ee48b80672fe6074fe7f5d55a40
diff --cc Cura/util/sliceEngine.py
index d1b49ec4,2678c69f..e19b1a74
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@@ -287,6 -287,17 +287,17 @@@ class Engine(object)
  	def runEngine(self, scene):
  		if len(scene.objects()) < 1:
  			return
 -		self._thread = threading.Thread(target=self._runEngine, args=(scene, self._thread))
++		self._thread = threading.Thread(target=self._runEngine, args=(scene, self._thread, pluginInfo.getPostProcessPluginConfig()))
+ 		self._thread.daemon = True
+ 		self._thread.start()
+ 
 -	def _runEngine(self, scene, old_thread):
++	def _runEngine(self, scene, old_thread, pluginConfig):
+ 		if old_thread is not None:
+ 			if self._process is not None:
+ 				self._process.terminate()
+ 			old_thread.join()
+ 		self._callback(-1.0)
+ 
  		extruderCount = 1
  		for obj in scene.objects():
  			if scene.checkPlatform(obj):
diff --cc package.sh
index c16205b3,1dd7b735..72557fc6
--- a/package.sh
+++ b/package.sh
@@@ -19,15 -19,9 +19,15 @@@ BUILD_TARGET=${1:-none
  ##Do we need to create the final archive
  ARCHIVE_FOR_DISTRIBUTION=1
  ##Which version name are we appending to the final archive
- export BUILD_NAME=14.12
+ export BUILD_NAME=15.01-RC1
  TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
  
 +##Revision
 +export REVISION=1.19
 +
 +##Git commit
 +GIT_HASH=$(git rev-parse --short=4 HEAD)
 +
  ##Which versions of external programs to use
  WIN_PORTABLE_PY_VERSION=2.7.2.1